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

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 394ce9b..c745677 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2217,6 +2217,7 @@ F:        arch/arm/boot/dts/mstar-*
 F:     arch/arm/mach-mstar/
 F:     drivers/clk/mstar/
 F:     drivers/gpio/gpio-msc313.c
+F:     drivers/watchdog/msc313e_wdt.c
 F:     include/dt-bindings/clock/mstar-*
 F:     include/dt-bindings/gpio/msc313-gpio.h
 
@@ -14826,6 +14827,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
 F:     Documentation/ABI/testing/sysfs-class-power
 F:     Documentation/devicetree/bindings/power/supply/
 F:     drivers/power/supply/
+F:     include/linux/power/
 F:     include/linux/power_supply.h
 
 POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
@@ -16212,7 +16214,7 @@ W:      http://www.ibm.com/developerworks/linux/linux390/
 F:     drivers/s390/scsi/zfcp_*
 
 S3C ADC BATTERY DRIVER
-M:     Krzysztof Kozlowski <krzk@kernel.org>
+M:     Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
 L:     linux-samsung-soc@vger.kernel.org
 S:     Odd Fixes
 F:     drivers/power/supply/s3c_adc_battery.c