Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Jul 2011 06:26:28 +0000 (23:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Jul 2011 06:26:28 +0000 (23:26 -0700)
commitb56045d4019a80935ead337e5c3f8e211fa9b471
tree996f7c724a2d6d11054325b0ed1b7c1f26366052
parent1acc9309eb2674533944f48dbaaa53e7750e3947
parent6ff325a2d85481cbe31dfbb74b4fd2d94c115300
Merge branch 'for-linus' of git://git./linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator: max8997: Fix setting inappropriate value for ramp_delay variable
  regulator: db8500-prcmu: small fixes
  regulator: max8997: remove dependency on platform_data pointer
  regulator: MAX8997: Fix for divide by zero error
  regulator: max8952 - fix wrong gpio valid check