Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[linux-2.6.git] / MAINTAINERS
index 28c0a96769270659f1948e14f9d2456a016ef718..31a13720f23c068a5de4a6e9118f23ce80a4adc7 100644 (file)
@@ -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