Merge remote-tracking branch 'regmap/fix/disable' into regmap-linus
authorMark Brown <broonie@linaro.org>
Tue, 6 Aug 2013 18:50:34 +0000 (19:50 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 6 Aug 2013 18:50:34 +0000 (19:50 +0100)

Trivial merge