Merge remote-tracking branch 'regulator/for-linus' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 28 Nov 2011 14:50:45 +0000 (14:50 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 28 Nov 2011 14:50:45 +0000 (14:50 +0000)

Trivial merge