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

12 files changed, 97 insertions, 42 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f2024df7ebe5..fc532395d116 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -273,3 +273,48 @@ Why:	Speedstep-centrino driver with ACPI hooks and acpi-cpufreq driver are
 Who:    Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 
 ---------------------------
+
+What:   ACPI hotkey driver (CONFIG_ACPI_HOTKEY)
+When:   2.6.21
+Why:    hotkey.c was an attempt to consolidate multiple drivers that use
+        ACPI to implement hotkeys.  However, hotkeys are not documented
+        in the ACPI specification, so the drivers used undocumented
+        vendor-specific hooks and turned out to be more different than
+        the same.
+
+        Further, the keys and the features supplied by each platform
+        are different, so there will always be a need for
+        platform-specific drivers.
+
+        So the new plan is to delete hotkey.c and instead, work on the
+        platform specific drivers to try to make them look the same
+        to the user when they supply the same features.
+
+        hotkey.c has always depended on CONFIG_EXPERIMENTAL
+
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
+
+What:   /sys/firmware/acpi/namespace
+When:   2.6.21
+Why:    The ACPI namespace is effectively the symbol list for
+        the BIOS.  The device names are completely arbitrary
+        and have no place being exposed to user-space.
+
+        For those interested in the BIOS ACPI namespace,
+        the BIOS can be extracted and disassembled with acpidump
+        and iasl as documented in the pmtools package here:
+        http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils
+
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
+
+What:   /proc/acpi/button
+When:   August 2007
+Why:    /proc/acpi/button has been replaced by events to the input layer
+        since 2.6.20.
+Who:    Len Brown <len.brown@intel.com>
+
+---------------------------
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
diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/i386/kernel/acpi/cstate.c
index 12e937c1ce4b..2d39f55d29a8 100644
--- a/arch/i386/kernel/acpi/cstate.c
+++ b/arch/i386/kernel/acpi/cstate.c
@@ -47,13 +47,13 @@ EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
 
 /* The code below handles cstate entry with monitor-mwait pair on Intel*/
 
-struct cstate_entry_s {
+struct cstate_entry {
         struct {
                 unsigned int eax;
                 unsigned int ecx;
         } states[ACPI_PROCESSOR_MAX_POWER];
 };
-static struct cstate_entry_s *cpu_cstate_entry; /* per CPU ptr */
+static struct cstate_entry *cpu_cstate_entry;   /* per CPU ptr */
 
 static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
 
@@ -71,7 +71,7 @@ static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
 int acpi_processor_ffh_cstate_probe(unsigned int cpu,
                 struct acpi_processor_cx *cx, struct acpi_power_register *reg)
 {
-        struct cstate_entry_s *percpu_entry;
+        struct cstate_entry *percpu_entry;
         struct cpuinfo_x86 *c = cpu_data + cpu;
 
         cpumask_t saved_mask;
@@ -136,7 +136,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe);
 void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx)
 {