Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Feb 2010 16:48:35 +0000 (08:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Feb 2010 16:48:35 +0000 (08:48 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()
  regulator: Fix display of null constraints for regulators


Trivial merge