Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f65baad1d857951d11b6416cdb629f3ad6290732..4c74516e4353f832908d964b744eb77edf682015 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4459,7 +4459,7 @@ CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-input@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
+F:     Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml
 F:     drivers/input/touchscreen/chipone_icn8318.c
 
 CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER
@@ -5205,6 +5205,13 @@ L:       linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/input/touchscreen/cy8ctma140.c
 
+CYPRESS STREETFIGHTER TOUCHKEYS DRIVER
+M:     Yassine Oudjana <y.oudjana@protonmail.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/input/cypress-sf.yaml
+F:     drivers/input/keyboard/cypress-sf.c
+
 CYTTSP TOUCHSCREEN DRIVER
 M:     Linus Walleij <linus.walleij@linaro.org>
 L:     linux-input@vger.kernel.org
@@ -8063,9 +8070,10 @@ F:       drivers/media/usb/go7007/
 
 GOODIX TOUCHSCREEN
 M:     Bastien Nocera <hadess@hadess.net>
+M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-input@vger.kernel.org
 S:     Maintained
-F:     drivers/input/touchscreen/goodix.c
+F:     drivers/input/touchscreen/goodix*
 
 GOOGLE ETHERNET DRIVERS
 M:     Jeroen de Borst <jeroendb@google.com>