summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-18 19:55:23 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-18 19:55:23 +0300
commit66893885bbf95b6c9030d97804cb678a70804edf (patch)
treeeb390def1c4155cdb9158c6c36281b8f18d3f2d0 /MAINTAINERS
parentec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff)
parent029b18361921a0a07b17bd89a2cf20df3d115de8 (diff)
downloadlinux-66893885bbf95b6c9030d97804cb678a70804edf.tar.xz
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--MAINTAINERS1
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
INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
M: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-M: Dmitry Torokhov <dtor@mail.ru>
L: linux-input@vger.kernel.org
Q: http://patchwork.kernel.org/project/linux-input/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git