diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-16 07:32:42 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-16 07:32:42 +0300 |
commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
tree | b9100463df79eeafbef87a0bbbaaba4740313120 /MAINTAINERS | |
parent | a1f9a4072655843fc03186acbad65990cc05dd2d (diff) | |
parent | 1d6a01365fd63fbf7c2709a183e2936728c8efad (diff) | |
download | linux-f20c86cd75f1c8c728dafd0218645ff3c5e8545d.tar.xz |
Merge branch 'next' into for-linus
Prepare input updates for 3.19.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f10ed3914ea8..f73bb4179832 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4062,6 +4062,12 @@ L: linux-media@vger.kernel.org S: Maintained F: drivers/media/usb/go7007/ +GOODIX TOUCHSCREEN +M: Bastien Nocera <hadess@hadess.net> +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/input/touchscreen/goodix.c + GPIO SUBSYSTEM M: Linus Walleij <linus.walleij@linaro.org> M: Alexandre Courbot <gnurou@gmail.com> |