Merge tag 'for-v4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
commit02184c60eba8491ea574cd17b8ba766c86d468f2
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2016 03:43:00 +0000 (27 20:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2016 03:43:00 +0000 (27 20:43 -0700)
tree168745f446cddfd411a2e247fefd1213a1d01da2
parent18751e2eb51261059e51e1a7cf5aec2fd5429608
parent362761299eea7dfc3a4870551de36e08758b9254
Merge tag 'for-v4.7-rc' of git://git./linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel.

* tag 'for-v4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power_supply: tps65217-charger: Fix NULL deref during property export
  power_supply: power_supply_read_temp only if use_cnt > 0