Merge remote-tracking branch 'regulator/fix/sec' into regulator-linus
authorMark Brown <broonie@linaro.org>
Thu, 4 Jul 2013 10:14:13 +0000 (11:14 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 4 Jul 2013 10:14:13 +0000 (11:14 +0100)

Trivial merge