]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'regulator-linus', 'regulator-core' and 'regulator-drivers' into regul...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Aug 2012 17:11:05 +0000 (18:11 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Aug 2012 17:11:05 +0000 (18:11 +0100)
1  2  3  4 
drivers/regulator/palmas-regulator.c
drivers/regulator/tps6586x-regulator.c

Simple merge