Merge tag 'topic/twl' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 19 Mar 2012 17:17:32 +0000 (17:17 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 19 Mar 2012 17:17:32 +0000 (17:17 +0000)
TWL specific changes, cross-merged with OMAP due to arch/arm wanting to
use the new ability to override the voltage set and get operations to
support the in-CPU voltage management.  The other changes are minor
fixes, the addition of a few new regulators and device tree support.

1  2 
drivers/mfd/twl-core.c

Simple merge