Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6

Pull power supply and reset fixes from Sebastian Reichel:
 "misc fixes"

* tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6:
  power: bq27x00_battery: Add missing MODULE_ALIAS
  power: reset: Add MFD_SYSCON depends for brcmstb
  power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
  power_supply: fix oops in collie_battery driver
  power/reset: at91: fix return value check in at91_reset_platform_probe()
  MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers
  axp288_fuel_gauge: Add original author details

1 files changed, 11 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 590304b96b03..246ca6964158 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6959,6 +6959,17 @@ T:	git git://git.rocketboards.org/linux-socfpga-next.git
 S:      Maintained
 F:      arch/nios2/
 
+NOKIA N900 POWER SUPPLY DRIVERS
+M:      Pali Rohár <pali.rohar@gmail.com>
+S:      Maintained
+F:      include/linux/power/bq2415x_charger.h
+F:      include/linux/power/bq27x00_battery.h
+F:      include/linux/power/isp1704_charger.h
+F:      drivers/power/bq2415x_charger.c
+F:      drivers/power/bq27x00_battery.c
+F:      drivers/power/isp1704_charger.c
+F:      drivers/power/rx51_battery.c
+
 NTB DRIVER
 M:      Jon Mason <jdmason@kudzu.us>
 M:      Dave Jiang <dave.jiang@intel.com>