From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Dec 2010 21:33:21 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
X-Git-Tag: v2.6.37-rc6~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=353495a5abcee1368a93f71b0e49390f96f24fb4;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator: tps6586x: correct register table
  regulator: tps6586x: Handle both enable reg/bits being the same
  regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
  regulator: tps6586x: Add missing bit mask generation
---

353495a5abcee1368a93f71b0e49390f96f24fb4