Merge remote-tracking branch 'regulator/fix/wm831x' into regulator-linus
authorMark Brown <broonie@linaro.org>
Mon, 30 Sep 2013 11:04:33 +0000 (12:04 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 30 Sep 2013 11:04:33 +0000 (12:04 +0100)

Trivial merge