Merge remote-tracking branches 'regulator/fix/bcm590xx', 'regulator/fix/s2m' and...
authorMark Brown <broonie@linaro.org>
Thu, 10 Apr 2014 22:39:38 +0000 (23:39 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 10 Apr 2014 22:39:38 +0000 (23:39 +0100)

Trivial merge