Merge tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel:
 "Add a regression fix for changed sysfs path of bq27xxx_battery and
  update MAINTAINERS file"

* tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: bq27xxx_battery: Restore device name
  MAINTAINERS: update bq27xxx driver

1 files changed, 8 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2fa3303ea625..21faebfeb508 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7686,13 +7686,13 @@ S:	Maintained
 F:      arch/nios2/
 
 NOKIA N900 POWER SUPPLY DRIVERS
-M:      Pali Rohár <pali.rohar@gmail.com>
-S:      Maintained
+R:      Pali Rohár <pali.rohar@gmail.com>
 F:      include/linux/power/bq2415x_charger.h
 F:      include/linux/power/bq27xxx_battery.h
 F:      include/linux/power/isp1704_charger.h
 F:      drivers/power/bq2415x_charger.c
 F:      drivers/power/bq27xxx_battery.c
+F:      drivers/power/bq27xxx_battery_i2c.c
 F:      drivers/power/isp1704_charger.c
 F:      drivers/power/rx51_battery.c
 
@@ -9558,6 +9558,12 @@ M:	Andreas Noever <andreas.noever@gmail.com>
 S:      Maintained
 F:      drivers/thunderbolt/
 
+TI BQ27XXX POWER SUPPLY DRIVER
+R:      Andrew F. Davis <afd@ti.com>
+F:      include/linux/power/bq27xxx_battery.h
+F:      drivers/power/bq27xxx_battery.c
+F:      drivers/power/bq27xxx_battery_i2c.c
+
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:      John Stultz <john.stultz@linaro.org>
 M:      Thomas Gleixner <tglx@linutronix.de>