commit 19b9aaf8a5fa634b2f16c3a2cfa819b74991273e
author Linus Torvalds <torvalds@linux-foundation.org> Wed Nov 15 13:37:15 2017 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Nov 15 13:37:15 2017 -0800
tree 622f9cd78f6bafdd1460aa4b26217d02c01dd9b1
parent 6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f
parent 838c8afa67f98014970c9f56107805e767ed87ad

Merge tag 'for-v4.15' of git://git.kernel.org/pub/scm/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