Merge remote-tracking branch 'regmap/fix/header' into regmap-linus
authorMark Brown <broonie@linaro.org>
Wed, 21 Aug 2013 16:08:17 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 Aug 2013 16:08:17 +0000 (17:08 +0100)

Trivial merge