1 files changed, 18 insertions, 11 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b03014d8357c..1c7c229a0926 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -216,7 +216,7 @@ P:	Len Brown
 M:      len.brown@intel.com
 M:      lenb@kernel.org
 L:      linux-acpi@vger.kernel.org
-W:      http://acpi.sourceforge.net/
+W:      http://www.lesswatts.org/projects/acpi/
 T:      git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:      Supported
 
@@ -235,8 +235,8 @@ W:	http://acpi.sourceforge.net/
 S:      Supported
 
 ACPI FAN DRIVER
-P:      Konstantin A. Karasyov
-M:      konstantin.a.karasyov@intel.com
+P:      Len Brown
+M:      len.brown@intel.com
 L:      linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 S:      Supported
@@ -248,15 +248,15 @@ L:	pcihpd-discuss@lists.sourceforge.net
 S:      Supported
 
 ACPI THERMAL DRIVER
-P:      Konstantin A. Karasyov
-M:      konstantin.a.karasyov@intel.com
+P:      Len Brown
+M:      len.brown@intel.com
 L:      linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 S:      Supported
 
 ACPI VIDEO DRIVER
-P:      Luming Yu
-M:      luming.yu@intel.com
+P:      Rui Zhang
+M:      rui.zhang@intel.com
 L:      linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 S:      Supported
@@ -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
 
@@ -3474,12 +3479,14 @@ L:	linux-pm@lists.linux-foundation.org
 S:      Supported
 
 SUSPEND TO RAM:
+P:      Len Brown
+M:      len.brown@intel.com
 P:      Pavel Machek
 M:      pavel@suse.cz
 P:      Rafael J. Wysocki
 M:      rjw@sisk.pl
 L:      linux-pm@lists.linux-foundation.org
-S:      Maintained
+S:      Supported
 
 SONIC NETWORK DRIVER
 P:      Thomas Bogendoerfer