Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
authorMark Brown <broonie@kernel.org>
Wed, 5 Nov 2014 14:59:24 +0000 (14:59 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 5 Nov 2014 14:59:24 +0000 (14:59 +0000)

Trivial merge