]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:39:38 +0000 (13:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:39:38 +0000 (13:39 +1000)
1  2 
drivers/power/Kconfig
drivers/power/Makefile

Simple merge
Simple merge