]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'regulator-linus' and 'regulator-core' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 18:52:53 +0000 (19:52 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 18:52:53 +0000 (19:52 +0100)
1  2  3 
drivers/regulator/core.c
drivers/regulator/twl-regulator.c

Simple merge
Simple merge