From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 01:26:47 +0000 (+1000)
Subject: Merge remote-tracking branch 'battery/for-next'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=113748f133e9b7afe08272a780637f9e331bd821

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

113748f133e9b7afe08272a780637f9e331bd821
diff --cc MAINTAINERS
index dcfaf9466d1b,9074e68baa47..3ed372abc0cf
--- a/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>