Merge remote-tracking branch 'battery/master'

diff --cc drivers/power/ds2780_battery.c
Simple merge

diff --cc drivers/power/max17042_battery.c
Simple merge

diff --cc drivers/power/max8903_charger.c
Simple merge

diff --cc drivers/power/max8997_charger.c
Simple merge

diff --cc drivers/power/max8998_charger.c
Simple merge

diff --cc drivers/power/power_supply_sysfs.c
Simple merge