Merge tag 'for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[platform/kernel/linux-rpi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 30b63ea..a938f79 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10175,7 +10175,7 @@ F:      drivers/misc/eeprom/eeprom.c
 LEGO MINDSTORMS EV3
 R:     David Lechner <david@lechnology.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt
+F:     Documentation/devicetree/bindings/power/supply/lego,ev3-battery.yaml
 F:     arch/arm/boot/dts/da850-lego-ev3.dts
 F:     drivers/power/supply/lego_ev3_battery.c
 
@@ -12002,6 +12002,14 @@ F:     drivers/scsi/smartpqi/smartpqi*.[ch]
 F:     include/linux/cciss*.h
 F:     include/uapi/linux/cciss*.h
 
+MICROSOFT SURFACE BATTERY AND AC DRIVERS
+M:     Maximilian Luz <luzmaximilian@gmail.com>
+L:     linux-pm@vger.kernel.org
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/power/supply/surface_battery.c
+F:     drivers/power/supply/surface_charger.c
+
 MICROSOFT SURFACE DTX DRIVER
 M:     Maximilian Luz <luzmaximilian@gmail.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -15854,6 +15862,13 @@ S:     Supported
 W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/scsi/zfcp_*
 
+S3C ADC BATTERY DRIVER
+M:     Krzysztof Kozlowski <krzk@kernel.org>
+L:     linux-samsung-soc@vger.kernel.org
+S:     Odd Fixes
+F:     drivers/power/supply/s3c_adc_battery.c
+F:     include/linux/s3c_adc_battery.h
+
 S3C24XX SD/MMC Driver
 M:     Ben Dooks <ben-linux@fluff.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)