diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-18 11:55:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-18 11:55:23 -0500 |
| commit | 66893885bbf95b6c9030d97804cb678a70804edf (patch) | |
| tree | eb390def1c4155cdb9158c6c36281b8f18d3f2d0 /MAINTAINERS | |
| parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) | |
| parent | 029b18361921a0a07b17bd89a2cf20df3d115de8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem fixes from Dmitry Torokhov.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION
Input: I8042 - add Acer Aspire 7738 to the nomux list
Input: elantech - support new ICs types for version 4
Input: i8042 - reset keyboard to fix Elantech touchpad detection
MAINTAINERS: remove Dmitry Torokhov's alternate address
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2fa385321245..2e99241d148d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4930,7 +4930,6 @@ F: include/uapi/linux/inotify.h | |||
| 4930 | 4930 | ||
| 4931 | INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS | 4931 | INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS |
| 4932 | M: Dmitry Torokhov <dmitry.torokhov@gmail.com> | 4932 | M: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| 4933 | M: Dmitry Torokhov <dtor@mail.ru> | ||
| 4934 | L: linux-input@vger.kernel.org | 4933 | L: linux-input@vger.kernel.org |
| 4935 | Q: http://patchwork.kernel.org/project/linux-input/list/ | 4934 | Q: http://patchwork.kernel.org/project/linux-input/list/ |
| 4936 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git | 4935 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git |