Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@kernel.org>
Fri, 16 Jan 2015 12:05:35 +0000 (12:05 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 16 Jan 2015 12:05:35 +0000 (12:05 +0000)

Trivial merge