diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-07 10:52:38 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-07 10:52:38 +1100 |
| commit | 1630a3822a5fcc0eba0787f52b6d5806936ff687 (patch) | |
| tree | bc707b0eb87748a1886f504967f6db79ff18b13e /MAINTAINERS | |
| parent | 827a4acaecc07cb46147b96f260f31afa28ab9aa (diff) | |
| parent | a6d38f889750ed6290728a19d9dad577b147c6d0 (diff) | |
Merge remote branch 'input/next'
Conflicts:
drivers/input/keyboard/Kconfig
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 b093bd325a4e..19f2ad0f58cb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3073,8 +3073,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 |