]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:36:24 +0000 (12:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 01:36:24 +0000 (12:36 +1100)
1  2 
arch/arm/boot/dts/omap3-n900.dts
drivers/power/bq27xxx_battery_i2c.c

Simple merge
Simple merge