Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Mar 2012 02:26:48 +0000 (18:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Mar 2012 02:26:48 +0000 (18:26 -0800)
commit13fb2d10371581f42c81da54ef7a1e1a9dfe6d46
tree1217685b5a931c2cf3b8700bb35047ae9976b1a3
parenta223c522805d4e9de4903fdd9c14588e558b2c16
parent3380643b0eaa7ecf99c4f095bdfcb6e5df471616
Merge tag 'for-linus' of git://git./linux/kernel/git/broonie/regulator

Pull from Mark Brown:
 "A simple, driver specific fix.  This device isn't widely used outside
  of Marvell reference boards most of which are probably used with their
  BSPs rather than with mainline so low risk."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: fix the ldo configure according to 88pm860x spec