]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'battery/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 04:29:55 +0000 (14:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 04:29:55 +0000 (14:29 +1000)
commit79890dc2ebe0783387b5bf2781a4c39cd2a76dd2
tree3937181661c266d151261483c9150e6e8ed55976
parent341cf15c557773166dd350b6cb2f4ad765123b05
parent18766f0936d444fd7ff2e0064bd6e69a89d5c6fc
Merge remote-tracking branch 'battery/master'

Conflicts:
include/linux/mfd/88pm860x.h
drivers/mfd/88pm860x-core.c
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/charger-manager.c
drivers/power/wm97xx_battery.c
include/linux/mfd/88pm860x.h