Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Mar 2012 00:16:02 +0000 (17:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Mar 2012 00:16:02 +0000 (17:16 -0700)
Pull regulator fixes from Mark Brown:
 "Another small batch of driver specific bug fixes, a couple more errors
  in the da9052 driver and a bad return value in the tps6524x driver."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: da9052: Ensure the selected voltage falls within the specified range
  regulator: Set n_voltages for da9052 regulators
  regulator: Fix setting selector in tps6524x set_voltage function


Trivial merge