From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Aug 2018 01:06:27 +0000 (-0700)
Subject: Merge tag 'for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~4693
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c1fecabecc352e40f99e6c5d7a74b8fcdfb38ae1;p=mirror_ubuntu-focal-kernel.git

Merge tag 'for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply and reset updates from Sebastian Reichel:

 - Improve support for TI bq20z75 in sbs-battery

 - Add Qualcomm PM8xxx reboot driver

 - Add cros-ec USBPD charger driver

 - Move ds2760 battery driver from w1 to power-supply and add DT support

 - Misc fixes

* tag 'for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (28 commits)
  power: supply: bq27xxx: Update comments
  power: supply: max77693_charger: fix unintentional fall-through
  power: supply: mark expected switch fall-throughs
  power: supply: lego_ev3_battery: fix Vce offset
  power: supply: lego_ev3_battery: Don't ignore iio_read_channel_processed() return value
  power: supply: ds2760_battery: add devicetree probing
  power: supply: ds2760_battery: merge ds2760 supply driver with its w1 slave companion
  w1: core: match sub-nodes of bus masters in devicetree
  dt-bindings: w1: document bindings for ds2760 battery monitor
  dt-bindings: w1: document generic onewire bindings
  power: supply: adp5061: Fix a couple off by ones
  dt-bindings: power: reset: qcom: Add resin binding
  adp5061: New driver for ADP5061 I2C battery charger
  power: generic-adc-battery: check for duplicate properties copied from iio channels
  power: generic-adc-battery: fix out-of-bounds write when copying channel properties
  power: supply: axp288_charger: Fix initial constant_charge_current value
  power: supply: ab8500: stop using getnstimeofday64()
  power: gemini-poweroff: Avoid more spurious poweroffs
  power: vexpress: fix corruption in notifier registration
  power: remove possible deadlock when unregistering power_supply
  ...
---

c1fecabecc352e40f99e6c5d7a74b8fcdfb38ae1
diff --cc MAINTAINERS
index e21e61f380fa,7b732456e916..24b200d91b30
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -836,12 -810,13 +836,19 @@@ L:	linux-media@vger.kernel.or
  S:	Maintained
  F:	drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADGS1408 DRIVER
 +M:	Mircea Caprioru <mircea.caprioru@analog.com>
 +S:	Supported
 +F:	drivers/mux/adgs1408.c
 +F:	Documentation/devicetree/bindings/mux/adgs1408.txt
 +
+ ANALOG DEVICES INC ADP5061 DRIVER
+ M:	Stefan Popa <stefan.popa@analog.com>
+ L:	linux-pm@vger.kernel.org
+ W:	http://ez.analog.com/community/linux-device-drivers
+ S:	Supported
+ F:	drivers/power/supply/adp5061.c
+ 
  ANALOG DEVICES INC ADV7180 DRIVER
  M:	Lars-Peter Clausen <lars@metafoo.de>
  L:	linux-media@vger.kernel.org