aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 11:01:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 11:01:58 -0700
commitcdf4f383a4b0ffbf458f65380ecffbeee1f79841 (patch)
tree8093cb3dbeda8827ca8b782f29474af523439c55 /MAINTAINERS
parent954b36d48b495afed2880320750858a2eae312c9 (diff)
parente2e8115b54aa6f159ac3dfec8d3d23b0af5fbfa0 (diff)
downloadkernel_samsung_smdk4412-cdf4f383a4b0ffbf458f65380ecffbeee1f79841.tar.gz
kernel_samsung_smdk4412-cdf4f383a4b0ffbf458f65380ecffbeee1f79841.tar.bz2
kernel_samsung_smdk4412-cdf4f383a4b0ffbf458f65380ecffbeee1f79841.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: iforce - remove some pointless casts Input: psmouse - add support for Intellimouse 4.0 Input: atkbd - fix HANGEUL/HANJA keys Input: fix misspelling of Hangeul key Input: via-pmu - add input device support Input: rearrange exports Input: fix formatting to better follow CodingStyle Input: reset name, phys and uniq when unregistering Input: return correct size when reading modalias attribute Input: change my e-mail address in MAINTAINERS file Input: fix potential overflows in driver/input/keyboard Input: fix potential overflows in driver/input/touchscreen Input: fix potential overflows in driver/input/joystick Input: fix potential overflows in driver/input/mouse Input: fix accuracy of fixp-arith.h Input: iforce - use ENOSPC instead of ENOMEM Input: constify drivers/char/keyboard.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 28c0a967692..31a13720f23 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1401,7 +1401,8 @@ S: Supported
INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
P: Dmitry Torokhov
-M: dtor_core@ameritech.net
+M: dmitry.torokhov@gmail.com
+M: dtor@mail.ru
L: linux-input@atrey.karlin.mff.cuni.cz
L: linux-joystick@atrey.karlin.mff.cuni.cz
T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git