Merge remote-tracking branch 'regulator/fix/max77693' into regulator-linus
authorMark Brown <broonie@linaro.org>
Mon, 1 Jul 2013 10:17:05 +0000 (11:17 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 1 Jul 2013 10:17:05 +0000 (11:17 +0100)

Trivial merge