From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Apr 2014 20:30:05 +0000 (-0700)
Subject: Merge tag 'regulator-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c0c4cf06456d4fffc45cb618a1a7af1e5861cbc8;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge tag 'regulator-v3.15-fixes' of git://git./linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A few driver specific fixes that have come in over the merge window,
  all only relevant for the specific driver"

* tag 'regulator-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: bcm590xx: Set n_voltages for linear reg
  regulator: s5m8767: Fix carried over ena_gpio assignment
  regulator: s2mps11: Don't check enable_shift before setting enable ramp rate
  regulator: s2mpa01: Don't check enable_shift before setting enable ramp rate
---

c0c4cf06456d4fffc45cb618a1a7af1e5861cbc8