Merge tag 'for-v4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2016 03:43:00 +0000 (20:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jun 2016 03:43:00 +0000 (20:43 -0700)
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


Trivial merge