Merge remote-tracking branch 'battery/for-next'

diff --cc MAINTAINERS
index dcfaf9466d1b820d48ffb1de95aff50f6fbc8653,9074e68baa47e98bbb11256cba5daf86f8777643..3ed372abc0cf8b58916d8cee3387a8a7f12c146b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7517,12 -7448,11 +7517,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>