Merge tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Dec 2014 21:24:38 +0000 (13:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Dec 2014 21:24:38 +0000 (13:24 -0800)
commit034496f40d64a4de786dfd39aa607d120c8c3cfc
tree706d97327381263ca068d82964614524a54b326c
parent5e6c2c97c56eb1b656e27fdcfaa3722828a9eca5
parent1222d8fe578cd28a6c7f5e4e6c6b664c56abfdc0
Merge tag 'regulator-v3.19-rc2' of git://git./linux/kernel/git/broonie/regulator

Pull one regulator fix from Mark Brown:
 "One fix here, a fix for the voltage mapping on one of the s2mps11
  regulators which broke systems using it including apparently the
  Gear 2 smartwatches"

* tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: s2mps11: Fix dw_mmc failure on Gear 2
drivers/regulator/s2mps11.c