From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Mar 2015 23:51:42 +0000 (-0700)
Subject: Merge tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7c9049dd47688d6ac336fa8a1f15ab7d8648fbd1;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'regulator-fix-v4.0-rc5' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "Two fixes here, one typo fix in the documentation and one fix for a
  system hang with one of the Palmas chips caused by the use of an
  incorrect offset being provided for one of the registers"

* tag 'regulator-fix-v4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix documentation for regmap in the config
  regulator: palmas: Correct TPS659038 register definition for REGEN2
---

7c9049dd47688d6ac336fa8a1f15ab7d8648fbd1