diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-10-19 03:42:32 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-10-19 03:42:32 +0200 |
| commit | bb0bc0cfeabc0d6865865e8d3a601bea6711f951 (patch) | |
| tree | f5321f28b6ea9c557316980226c6139a45a3aec9 /MAINTAINERS | |
| parent | Input: i8042 - add nopnp quirk for Acer Aspire 5 A515 (diff) | |
| parent | Input: Add MAINTAINERS entry for SiS i2c touch input driver (diff) | |
| download | linux-bb0bc0cfeabc0d6865865e8d3a601bea6711f951.tar.xz linux-bb0bc0cfeabc0d6865865e8d3a601bea6711f951.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.10 merge window.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d7e3eab852d3..5008e811f1cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15441,6 +15441,13 @@ F: Documentation/fb/sisfb.rst F: drivers/video/fbdev/sis/ F: include/video/sisfb.h +SIS I2C TOUCHSCREEN DRIVER +M: Mika Penttilä <mika.penttila@nextfour.com> +L: linux-input@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/input/touchscreen/sis_i2c.txt +F: drivers/input/touchscreen/sis_i2c.c + SIS USB2VGA DRIVER M: Thomas Winischhofer <thomas@winischhofer.net> S: Maintained |