Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:19:25 +0000 (16:19 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:19:25 +0000 (16:19 +0100)

Trivial merge