]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:02:13 +0000 (12:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 01:02:13 +0000 (12:02 +1100)
1  2 
drivers/power/ds2780_battery.c

Simple merge