Merge branch 'regulator-drivers' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 Jul 2012 18:32:00 +0000 (19:32 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 Jul 2012 18:32:00 +0000 (19:32 +0100)

Trivial merge