Merge branch 'next' into for-linus

[linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c125f7..57eba28 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3431,6 +3431,12 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
 F:     drivers/input/touchscreen/chipone_icn8318.c
 
+CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/input/touchscreen/chipone_icn8505.c
+
 CHROME HARDWARE PLATFORM SUPPORT
 M:     Benson Leung <bleung@chromium.org>
 M:     Olof Johansson <olof@lixom.net>
@@ -7004,6 +7010,7 @@ F:        include/uapi/linux/input.h
 F:     include/uapi/linux/input-event-codes.h
 F:     include/linux/input/
 F:     Documentation/devicetree/bindings/input/
+F:     Documentation/devicetree/bindings/serio/
 F:     Documentation/input/
 
 INPUT MULTITOUCH (MT) PROTOCOL
@@ -11038,6 +11045,13 @@ S:     Maintained
 F:     include/linux/personality.h
 F:     include/uapi/linux/personality.h
 
+PHOENIX RC FLIGHT CONTROLLER ADAPTER
+M:     Marcus Folkesson <marcus.folkesson@gmail.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     Documentation/input/devices/pxrc.rst
+F:     drivers/input/joystick/pxrc.c
+
 PHONET PROTOCOL
 M:     Remi Denis-Courmont <courmisch@gmail.com>
 S:     Supported