Merge branch 'regmap-mfd' into regmap-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 11:33:11 +0000 (12:33 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 11:33:11 +0000 (12:33 +0100)

Trivial merge