Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6
Merge commit. Changes below are compared with the first parent: 6b049081.
Changes
33 files changed · +1919 −249
Only the first 600 diff lines are shown. Download the complete patch.
Documentation/ABI/testing/sysfs-class-power
View fileDocumentation/devicetree/bindings/gpio/gpio-restart.txt
View fileDocumentation/devicetree/bindings/mfd/max14577.txt
View fileDocumentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt
View fileDocumentation/devicetree/bindings/power/reset/st-reset.txt
View fileDocumentation/devicetree/bindings/power/reset/syscon-reboot.txt
View fileDocumentation/power/charger-manager.txt
View fileDocumentation/power/power_supply_class.txt
View filedrivers/mfd/max14577.c
View filedrivers/power/Kconfig
View filedrivers/power/ab8500_fg.c
View filedrivers/power/bq27x00_battery.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/charger-manager.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/gpio-charger.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/max14577_charger.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/max17040_battery.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/max8925_power.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/power_supply_core.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/power_supply_leds.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/power_supply_sysfs.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/Makefile
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/gpio-restart.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/ltc2952-poweroff.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/msm-poweroff.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/st-poweroff.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/syscon-reboot.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/reset/xgene-reboot.c
View fileThis diff is incomplete. Download the complete patch.
drivers/power/sbs-battery.c
View fileThis diff is incomplete. Download the complete patch.
drivers/regulator/max14577.c
View fileThis diff is incomplete. Download the complete patch.
include/linux/mfd/max14577-private.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/mfd/max14577.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/power_supply.h
View fileThis diff is incomplete. Download the complete patch.