Merge remote-tracking branch 'regulator/fix/s2mpa01' into regulator-linus
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:07:59 +0000 (17:07 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:07:59 +0000 (17:07 +0100)

Trivial merge