From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Aug 2013 16:34:40 +0000 (-0700)
Subject: Merge tag 'regulator-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.11-rc5~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84e4526f88e5904509f0226dfabdbbc9d99c7db3;p=platform%2Fkernel%2Flinux-stable.git

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
---

84e4526f88e5904509f0226dfabdbbc9d99c7db3