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 f2bfabc..c745677 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -752,6 +752,12 @@ L: linux-crypto@vger.kernel.org
 S:     Maintained
 F:     drivers/crypto/allwinner/
 
+ALLWINNER HARDWARE SPINLOCK SUPPORT
+M:     Wilken Gottwalt <wilken.gottwalt@posteo.net>
+S:     Maintained
+F:     Documentation/devicetree/bindings/hwlock/allwinner,sun6i-hwspinlock.yaml
+F:     drivers/hwspinlock/sun6i_hwspinlock.c
+
 ALLWINNER THERMAL DRIVER
 M:     Vasily Khoruzhick <anarsoul@gmail.com>
 M:     Yangtao Li <tiny.windzz@gmail.com>
@@ -2211,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
 
@@ -12527,7 +12534,8 @@ S:      Maintained
 F:     drivers/net/phy/motorcomm.c
 
 MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
-S:     Orphan
+M:     Jiri Slaby <jirislaby@kernel.org>
+S:     Maintained
 F:     Documentation/driver-api/serial/moxa-smartio.rst
 F:     drivers/tty/mxser.*
 
@@ -14819,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
@@ -16205,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
@@ -18771,9 +18780,13 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 F:     Documentation/driver-api/serial/
 F:     drivers/tty/
 F:     drivers/tty/serial/serial_core.c
+F:     include/linux/selection.h
 F:     include/linux/serial.h
 F:     include/linux/serial_core.h
-F:     include/linux/tty.h
+F:     include/linux/sysrq.h
+F:     include/linux/tty*.h
+F:     include/linux/vt.h
+F:     include/linux/vt_*.h
 F:     include/uapi/linux/serial.h
 F:     include/uapi/linux/serial_core.h
 F:     include/uapi/linux/tty.h