Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-microblaze.git] / MAINTAINERS
index a6ae125..3e449fa 100644 (file)
@@ -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