Merge remote-tracking branch 'regulator/topic/core' into regulator-linus
authorMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 12:01:24 +0000 (12:01 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 23 Jan 2014 12:01:24 +0000 (12:01 +0000)

Trivial merge