From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Nov 2017 21:37:15 +0000 (-0800)
Subject: Merge tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Tag: v4.19~2187
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19b9aaf8a5fa634b2f16c3a2cfa819b74991273e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'for-v4.15' of git://git./linux/kernel/git/sre/linux-power-supply

Pull power supply and reset updates from Sebastian Reichel:

 - misc minor fixes

* tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: supply: cpcap-charger: fix incorrect return value check
  power: supply: replace pr_* with dev_*
  power: supply: pcf50633-charger: remove redundant variable charging_start
  power: supply: generic-adc-battery: remove redundant variable pdata
  power: supply: max8997: Improve a size determination in probe
---

19b9aaf8a5fa634b2f16c3a2cfa819b74991273e