Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  Revert "ACPI: ibm-acpi: make non-generic bay support optional"
  ACPI: update MAINTAINERS
  ACPI: schedule obsolete features for deletion
  ACPI: delete two spurious ACPI messages
  ACPI: rename cstate_entry_s to cstate_entry
  ACPI: ec: enable printk on cmdline use
  ACPI: Altix: ACPI _PRT support

1 files changed, 34 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 49e4f554d211..1b1491d64ca6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -207,16 +207,45 @@ S:	Supported
 ACPI
 P:      Len Brown
 M:      len.brown@intel.com
+M:      lenb@kernel.org
 L:      linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 T:      git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
-S:      Maintained
+S:      Supported
+
+ACPI BATTERY DRIVERS
+P:      Vladimir P. Lebedev
+M:      vladimir.p.lebedev@intel.com
+L:      linux-acpi@vger.kernel.org
+W:      http://acpi.sourceforge.net/
+S:      Supported
+
+ACPI EC DRIVER
+P:      Alexey Starikovskiy
+M:      alexey.y.starikovskiy@linux.intel.com
+L:      linux-acpi@vger.kernel.org
+W:      http://acpi.sourceforge.net/
+S:      Supported
+
+ACPI FAN DRIVER
+P:      Konstantin A. Karasyov
+M:      konstantin.a.karasyov@intel.com
+L:      linux-acpi@vger.kernel.org
+W:      http://acpi.sourceforge.net/
+S:      Supported
 
 ACPI PCI HOTPLUG DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
 L:      pcihpd-discuss@lists.sourceforge.net
-S:      Maintained
+S:      Supported
+
+ACPI THERMAL DRIVER
+P:      Konstantin A. Karasyov
+M:      konstantin.a.karasyov@intel.com
+L:      linux-acpi@vger.kernel.org
+W:      http://acpi.sourceforge.net/
+S:      Supported
 
 AD1816 SOUND DRIVER
 P:      Thorsten Knabe
@@ -1085,7 +1114,7 @@ DOCKING STATION DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
 L:      linux-acpi@vger.kernel.org
-S:      Maintained
+S:      Supported
 
 DOUBLETALK DRIVER
 P:      James R. Van Zandt
@@ -2535,7 +2564,7 @@ PCIE HOTPLUG DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
 L:      pcihpd-discuss@lists.sourceforge.net
-S:      Maintained
+S:      Supported
 
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
@@ -3041,7 +3070,7 @@ SHPC HOTPLUG DRIVER
 P:      Kristen Carlson Accardi
 M:      kristen.c.accardi@intel.com
 L:      pcihpd-discuss@lists.sourceforge.net
-S:      Maintained
+S:      Supported
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER
 P:      Pierre Ossman