Merge tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Aug 2013 16:34:40 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Aug 2013 16:34:40 +0000 (09:34 -0700)
commit84e4526f88e5904509f0226dfabdbbc9d99c7db3
tree6ce2345aab1a5d7f373e277a0c9b4a36b3083c91
parentd56290bbc1ad0cf56b25f7cb5859305a486b1bbc
parent386c90ac747913f1a31a0cdacb14f2347114474d
Merge tag 'regulator-v3.11-rc4' of git://git./linux/kernel/git/broonie/regulator

Pull regulator DT binding fixes from Mark Brown:
 "A couple of fixes to bring the DT binding documentation for Palmas
  into sync with the code"

* tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: palmas-pmic: doc: remove ti,tstep
  regulator: palmas-pmic: doc: fix typo for sleep-mode