Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@linaro.org>
Wed, 23 Apr 2014 12:50:11 +0000 (13:50 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 23 Apr 2014 12:50:11 +0000 (13:50 +0100)

Trivial merge