Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
authorMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000 (00:34 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:34:28 +0000 (00:34 +0100)
Conflicts:
drivers/regulator/palmas-regulator.c


Trivial merge