Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:52:14 +0000 (16:52 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:52:14 +0000 (16:52 +0100)

Trivial merge