]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit717fdd41764b96974a0f56d7d84a17b7b3ef5750
tree62b84ad3f1f06dd810e695fa2da410ef12870aca
parentba19ecb9289229f2b2cf5e23f701ee115932eef3
parentf8c63918c9a3004bd052fa4af08aa1cefbcd79ac
Merge remote-tracking branch 'battery/master'
drivers/power/Kconfig
drivers/power/Makefile