From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jun 2016 03:43:00 +0000 (-0700)
Subject: Merge tag 'for-v4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Tag: v4.14-rc1~2964
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02184c60eba8491ea574cd17b8ba766c86d468f2;p=platform%2Fkernel%2Flinux-rpi.git

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

02184c60eba8491ea574cd17b8ba766c86d468f2