From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Dec 2014 21:24:38 +0000 (-0800)
Subject: Merge tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.19-rc3~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=034496f40d64a4de786dfd39aa607d120c8c3cfc;p=~emulex%2Finfiniband.git

Merge tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/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
---

034496f40d64a4de786dfd39aa607d120c8c3cfc