]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'regulator-drivers' and 'regulator-linus' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 15 Aug 2012 16:54:52 +0000 (17:54 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 15 Aug 2012 16:54:52 +0000 (17:54 +0100)
1  2  3 
drivers/regulator/Kconfig
drivers/regulator/twl-regulator.c

Simple merge
Simple merge