Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@linaro.org>
Tue, 4 Feb 2014 12:58:17 +0000 (12:58 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 4 Feb 2014 12:58:17 +0000 (12:58 +0000)

Trivial merge