Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@kernel.org>
Tue, 6 Oct 2015 11:00:38 +0000 (12:00 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 6 Oct 2015 11:00:38 +0000 (12:00 +0100)

Trivial merge