Merge tag 'tag-chrome-platform-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b2326dece28ebeb1412b04bcc49f81705da58c99..3e449fad6cad1074739f8788dd9e78b0a43c9dc3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1400,7 +1400,7 @@ F:        drivers/pinctrl/actions/*
 F:     drivers/soc/actions/
 F:     include/dt-bindings/power/owl-*
 F:     include/linux/soc/actions/
-F:     Documentation/devicetree/bindings/arm/actions.txt
+F:     Documentation/devicetree/bindings/arm/actions.yaml
 F:     Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 F:     Documentation/devicetree/bindings/dma/owl-dma.txt
 F:     Documentation/devicetree/bindings/i2c/i2c-owl.txt
@@ -2166,7 +2166,7 @@ M:        Andreas Färber <afaerber@suse.de>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm64/boot/dts/realtek/
-F:     Documentation/devicetree/bindings/arm/realtek.txt
+F:     Documentation/devicetree/bindings/arm/realtek.yaml
 
 ARM/RENESAS ARM64 ARCHITECTURE
 M:     Simon Horman <horms@verge.net.au>
@@ -12742,6 +12742,12 @@ S:     Maintained
 F:     Documentation/input/devices/pxrc.rst
 F:     drivers/input/joystick/pxrc.c
 
+FLYSKY FSIA6B RC RECEIVER
+M:     Markus Koch <markus@notsyncing.net>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/input/joystick/fsia6b.c
+
 PHONET PROTOCOL
 M:     Remi Denis-Courmont <courmisch@gmail.com>
 S:     Supported