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)
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

1  2 
drivers/regulator/s2mps11.c

Simple merge