diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-11-11 21:58:54 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-11-11 21:58:54 -0800 |
commit | efe6f16c6faf724882ddaba2eda8830a87bcc2b2 (patch) | |
tree | ab5a4ac8c5b917b07af95c866770659f330b7f2b /MAINTAINERS | |
parent | a02dcde595f7cbd240ccd64de96034ad91cffc40 (diff) | |
parent | 744d0090a5f6dfa4c81b53402ccdf08313100429 (diff) | |
download | linux-efe6f16c6faf724882ddaba2eda8830a87bcc2b2.tar.bz2 |
Merge branch 'next' into for-linus
Prepare input updates for 5.16 merge window.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b03c68cebe4c..5122b3a3bf56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4301,7 +4301,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 @@ -5006,6 +5006,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 @@ -7709,9 +7716,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: Catherine Sullivan <csully@google.com> |