From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Nov 2014 23:22:51 +0000 (-0800)
Subject: Merge tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6
X-Git-Tag: v3.18-rc5~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ec7de6567ffdc8bdcf816365ef56bc0771afb63d;p=linux-2.6-block.git

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
---

ec7de6567ffdc8bdcf816365ef56bc0771afb63d