diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
| commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
| tree | b9100463df79eeafbef87a0bbbaaba4740313120 /MAINTAINERS | |
| parent | a1f9a4072655843fc03186acbad65990cc05dd2d (diff) | |
| parent | 1d6a01365fd63fbf7c2709a183e2936728c8efad (diff) | |
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 | |||
| 4062 | S: Maintained | 4062 | S: Maintained |
| 4063 | F: drivers/media/usb/go7007/ | 4063 | F: drivers/media/usb/go7007/ |
| 4064 | 4064 | ||
| 4065 | GOODIX TOUCHSCREEN | ||
| 4066 | M: Bastien Nocera <hadess@hadess.net> | ||
| 4067 | L: linux-input@vger.kernel.org | ||
| 4068 | S: Maintained | ||
| 4069 | F: drivers/input/touchscreen/goodix.c | ||
| 4070 | |||
| 4065 | GPIO SUBSYSTEM | 4071 | GPIO SUBSYSTEM |
| 4066 | M: Linus Walleij <linus.walleij@linaro.org> | 4072 | M: Linus Walleij <linus.walleij@linaro.org> |
| 4067 | M: Alexandre Courbot <gnurou@gmail.com> | 4073 | M: Alexandre Courbot <gnurou@gmail.com> |