Merge tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Nov 2014 23:22:51 +0000 (15:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Nov 2014 23:22:51 +0000 (15:22 -0800)
commitec7de6567ffdc8bdcf816365ef56bc0771afb63d
tree2cc51323547be730d8ca8778304de4345d27e5d8
parente061167151b3caad080349aaa6eed594d0c745c4
parentcdaf3e15385d3232b52287e50692506f8fd01a09
Merge tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6

Pull power supply updates from Sebastian Reichel:
 "Power supply and reset changes for the v3.18-rc:

   - misc. charger-manager fixes
   - year 2038 fix in ab8500_fg
   - fix error handling of bq2415x_charger"

* tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6:
  power: charger-manager: Fix accessing invalidated power supply after charger unbind
  power: charger-manager: Fix accessing invalidated power supply after fuel gauge unbind
  power: charger-manager: Avoid recursive thermal get_temp call
  power_supply: Add no_thermal property to prevent recursive get_temp calls
  power: bq2415x_charger: Fix memory leak on DTS parsing error
  power: bq2415x_charger: Properly handle ENODEV from power_supply_get_by_phandle
  power: ab8500_fg.c: use 64-bit time types