Pull documentation into release branch

1 files changed, 10 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 231bda28c428..4a26f832b4b5 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
@@ -3472,12 +3472,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