Merge remote-tracking branch 'regulator/fix/pfuze100' into regulator-linus
authorMark Brown <broonie@linaro.org>
Sun, 24 Nov 2013 14:02:50 +0000 (14:02 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 24 Nov 2013 14:02:50 +0000 (14:02 +0000)

Trivial merge