Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 10:19:48 +0000 (11:19 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 22 Jun 2015 10:19:48 +0000 (11:19 +0100)

Trivial merge