diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 07:34:59 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 07:34:59 +0100 |
| commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
| tree | 149a96ce3727025d3b9260961ec94ba8306db278 /MAINTAINERS | |
| parent | Input: wacom - add support for digitizer in Lenovo W700 (diff) | |
| parent | Input: wacom_w8001 - support pen or touch only devices (diff) | |
| download | linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.xz linux-554738da71004d96e06fb75f4772dfc3b0f47810.zip | |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0094224ca79b..a9d3a1343698 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3020,8 +3020,10 @@ F: drivers/input/ INPUT MULTITOUCH (MT) PROTOCOL M: Henrik Rydberg <rydberg@euromail.se> L: linux-input@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git S: Maintained F: Documentation/input/multi-touch-protocol.txt +F: drivers/input/input-mt.c K: \b(ABS|SYN)_MT_ INTEL IDLE DRIVER |