Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@kernel.org>
Mon, 27 Oct 2014 11:26:23 +0000 (11:26 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 27 Oct 2014 11:26:23 +0000 (11:26 +0000)

Trivial merge