diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 11:03:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 11:03:00 -0400 |
| commit | 1a5f20fe197f814fc0b29173894a706f478db821 (patch) | |
| tree | f09735a5265639f40f3cfb6e2187b4239c9ae3eb /MAINTAINERS | |
| parent | 55982d94009c8fb1ea79855dba0c079c36224c38 (diff) | |
| parent | 3267a87f9dc38d036571ff0880533d9ae8989f01 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
MAINTAINERS - Add an entry for the input MT protocol
Input: wacom - fix serial number handling on Cintiq 21UX2
Input: fixup X86_MRST selects
Input: sysrq - fix "stuck" SysRq mode
Input: ad7877 - fix spi word size to 16 bit
Input: pcf8574_keypad - fix off by one in pcf8574_kp_irq_handler()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b15f01e3a0dd..78758e12a810 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2887,6 +2887,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git | |||
| 2887 | S: Maintained | 2887 | S: Maintained |
| 2888 | F: drivers/input/ | 2888 | F: drivers/input/ |
| 2889 | 2889 | ||
| 2890 | INPUT MULTITOUCH (MT) PROTOCOL | ||
| 2891 | M: Henrik Rydberg <rydberg@euromail.se> | ||
| 2892 | L: linux-input@vger.kernel.org | ||
| 2893 | S: Maintained | ||
| 2894 | F: Documentation/input/multi-touch-protocol.txt | ||
| 2895 | K: \b(ABS|SYN)_MT_ | ||
| 2896 | |||
| 2890 | INTEL IDLE DRIVER | 2897 | INTEL IDLE DRIVER |
| 2891 | M: Len Brown <lenb@kernel.org> | 2898 | M: Len Brown <lenb@kernel.org> |
| 2892 | L: linux-pm@lists.linux-foundation.org | 2899 | L: linux-pm@lists.linux-foundation.org |