From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 22:13:24 +0000 (-0700)
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-rc1~56
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e;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: max8952 - fix max8952_set_voltage
  regulator: max8952 - fix max8952_pmic_probe error path
  regulator: fix build when CONFIG_REGULATOR_DUMMY=n
  regulator: avoid deadlock when disabling regulator with supply
  regulator: Add option for machine drivers to enable the dummy regulator
  Regulator: lp3972 cleanup
  Regulator: LP3972 PMIC regulator driver
  MAX8952 PMIC Driver Initial Release
---

9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e