diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-10-18 18:42:32 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-10-18 18:42:32 -0700 |
| commit | bb0bc0cfeabc0d6865865e8d3a601bea6711f951 (patch) | |
| tree | f5321f28b6ea9c557316980226c6139a45a3aec9 /MAINTAINERS | |
| parent | 5fc27b098dafb8e30794a9db0705074c7d766179 (diff) | |
| parent | 8a30c6eb29e036f729b4dd6982462ca15d062087 (diff) | |
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 |