]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'regulator-core' and 'regulator-drivers' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Aug 2012 20:10:42 +0000 (21:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Aug 2012 20:10:42 +0000 (21:10 +0100)
1  2  3 
drivers/regulator/core.c

Simple merge