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:
  Input: linux-input mailing list moved to vger.kernel.org
  Input: inport, logibm - use KERN_INFO when reporting missing mouse
  Input: appletouch - idle reset logic broke older Fountains
  Input: hp_sdc.c - fix section mismatch
  Input: appletouch - add Johannes Berg as maintainer
  Input: Add Euro and Dollar key codes
  Input: xpad - add more USB IDs

1 files changed, 8 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4a26f832b4b5..6c0e44bbf601 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -398,6 +398,12 @@ P:	Arnaldo Carvalho de Melo
 M:      acme@ghostprotocols.net
 S:      Maintained
 
+APPLETOUCH TOUCHPAD DRIVER
+P:      Johannes Berg
+M:      johannes@sipsolutions.net
+L:      linux-input@vger.kernel.org
+S:      Maintained
+
 ARC FRAMEBUFFER DRIVER
 P:      Jaya Kumar
 M:      jayalk@intworks.biz
@@ -1701,7 +1707,7 @@ S:	Maintained
 HID CORE LAYER
 P:      Jiri Kosina
 M:      jkosina@suse.cz
-L:      linux-input@atrey.karlin.mff.cuni.cz
+L:      linux-input@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
 S:      Maintained
 
@@ -1927,8 +1933,7 @@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 P:      Dmitry Torokhov
 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
+L:      linux-input@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
 S:      Maintained