Merge tag 'regulator-v3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Mar 2014 16:41:42 +0000 (08:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Mar 2014 16:41:42 +0000 (08:41 -0800)
commit16e3f5391c23a52a91a11ee4f2661a625b36dfe1
tree9c154ceb020875c411d8f9518bbf9474dac8f587
parent3f803abf2e49fe18aaeff9532afc353e68e689c7
parent66fda75f47dc583f1c187556e9a2c082dd64f8c6
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
drivers/regulator/core.c