From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Mar 2014 16:41:42 +0000 (-0800)
Subject: Merge tag 'regulator-v3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.0~2294
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16e3f5391c23a52a91a11ee4f2661a625b36dfe1;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'regulator-v3.14-rc5' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of fixes here which ensure that regulators using the core
  support for GPIO enables work in all cases by ensuring that helpers
  are used consistently rather than open coding in places and hence not
  having GPIO support in some of them"

* tag 'regulator-v3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: Replace direct ops->disable usage
  regulator: core: Replace direct ops->enable usage
---

16e3f5391c23a52a91a11ee4f2661a625b36dfe1