• Linus Torvalds's avatar
    Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6 · 76f901eb
    Linus Torvalds authored
    Pull battery updates from Anton Vorontsov:
     "A bunch of fixes for v3.5, nothing extraordinary."
    * tag 'for-v3.5' of git://git.infradead.org/battery-2.6: (27 commits)
      smb347-charger: Include missing <linux/err.h>
      smb347-charger: Clean up battery attributes
      max17042_battery: Add support for max17047/50 chip
      sbs-battery.c: Capacity attr = remaining relative capacity
      isp1704_charger: Use after free on probe error
      ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZE
      power_supply: Fix a typo in BATTERY_DS2781 Kconfig entry
      charger-manager: Provide cm_notify_event function for in-kernel use
      charger-manager: Poll battery health in normal state
      smb347-charger: Convert to regmap API
      smb347-charger: Move IRQ enabling to the end of probe
      smb347-charger: Rename few functions to match better what they are doing
      smb347-charger: Convert to use module_i2c_driver()
      smb347_charger: Cleanup power supply registration code in probe
      ab8500: Clean up probe routines
      ab8500_fg: Harden platform data check
      ab8500_btemp: Harden platform data check
      ab8500_charger: Harden platform data check
      MAINTAINERS: Fix 'F' entry for the power supply class
      max17042_battery: Handle irq request failure case