Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 18 Mar 2012 21:39:19 +0000 (21:39 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 18 Mar 2012 21:39:19 +0000 (21:39 +0000)
1  2 
drivers/mfd/twl-core.c
drivers/regulator/core.c

Simple merge
Simple merge