From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Oct 2016 01:21:15 +0000 (-0700)
Subject: Merge tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=021723e6c5a5e7b50eb68f9812418406de9860b2;p=openwrt%2Fstaging%2Fblogic.git

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

Pull power supply and reset updates from Sebastian Reichel:
 - move power supply drivers to drivers/power/supply
 - unify location of power supply DT documentation
 - tps65217-charger: IRQ support
 - act8945a-charger: misc. cleanups & improvements
 - sbs-battery cleanup
 - fix users of deprecated create_singlethread_workqueue()
 - misc fixes.

* tag 'for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (46 commits)
  power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update
  power: supply: sbs-battery: Cleanup removal of chip->pdata
  power: reset: st: Remove obsolete platforms from dt doc
  power: reset: st-poweroff: Remove obsolete platforms.
  power: reset: zx-reboot: Unmap region obtained by of_iomap
  power: reset: xgene-reboot: Unmap region obtained by of_iomap
  power: supply: ab8500: cleanup with list_first_entry_or_null()
  power: reset: add in missing white space in error message text
  sbs-battery: make writes to ManufacturerAccess optional
  power: bq24257: Fix use of uninitialized pointer bq->charger
  power: supply: sbs-battery: simplify DT parsing
  power: supply: bq24735-charger: Request status GPIO with initial input setup
  power: supply: sbs-battery: Use gpio_desc and sleeping calls for battery detect
  power: supply: act8945a_charger: Add max current property
  power: supply: act8945a_charger: Add capacity level property
  doc: bindings: power: act8945a-charger: Update properties.
  power: supply: act8945a_charger: Fix the power supply type
  power: supply: act8945a_charger: Add status change update support
  power: supply: act8945a_charger: Improve state handling
  power: supply: act8945a_charger: Remove "battery_temperature"
  ...
---

021723e6c5a5e7b50eb68f9812418406de9860b2
diff --cc MAINTAINERS
index 464437dbfa26,9074e68baa47..40f462966564
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7575,12 -7448,11 +7575,12 @@@ F:	Documentation/devicetree/bindings/so
  F:	sound/soc/codecs/max9860.*
  
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 -M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +M:	Krzysztof Kozlowski <krzk@kernel.org>
 +M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:	linux-pm@vger.kernel.org
  S:	Supported
- F:	drivers/power/max14577_charger.c
- F:	drivers/power/max77693_charger.c
+ F:	drivers/power/supply/max14577_charger.c
+ F:	drivers/power/supply/max77693_charger.c
  
  MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
  M:	Javier Martinez Canillas <javier@osg.samsung.com>