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: (65 commits)
  ACPI: suppress power button event on S3 resume
  ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
  ACPI: use for_each_possible_cpu() instead of for_each_cpu()
  ACPI: delete newly added debugging macros in processor_perflib.c
  ACPI: UP build fix for bugzilla-5737
  Enable P-state software coordination via _PDC
  P-state software coordination for speedstep-centrino
  P-state software coordination for acpi-cpufreq
  P-state software coordination for ACPI core
  ACPI: create acpi_thermal_resume()
  ACPI: create acpi_fan_suspend()/acpi_fan_resume()
  ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend()
  ACPI: create acpi_device_suspend()/acpi_device_resume()
  ACPI: replace spin_lock_irq with mutex for ec poll mode
  ACPI: Allow a WAN module enable/disable on a Thinkpad X60.
  sem2mutex: acpi, acpi_link_lock
  ACPI: delete unused acpi_bus_drivers_lock
  sem2mutex: drivers/acpi/processor_perflib.c
  ACPI add ia64 exports to build acpi_memhotplug as a module
  ACPI: asus_acpi_init(): propagate correct return value
  ...

Manual resolve of conflicts in:

	arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
	arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
	include/acpi/processor.h

1 files changed, 70 insertions, 0 deletions

diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 262b1f41335a..15fc12482ba0 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -567,6 +567,69 @@ static int bluetooth_write(char *buf)
         return 0;
 }
 
+static int wan_supported;
+
+static int wan_init(void)
+{
+        wan_supported = hkey_handle &&
+            acpi_evalf(hkey_handle, NULL, "GWAN", "qv");
+
+        return 0;
+}
+
+static int wan_status(void)
+{
+        int status;
+
+        if (!wan_supported ||
+            !acpi_evalf(hkey_handle, &status, "GWAN", "d"))
+                status = 0;
+
+        return status;
+}
+
+static int wan_read(char *p)
+{
+        int len = 0;
+        int status = wan_status();
+
+        if (!wan_supported)
+                len += sprintf(p + len, "status:\t\tnot supported\n");
+        else if (!(status & 1))
+                len += sprintf(p + len, "status:\t\tnot installed\n");
+        else {
+                len += sprintf(p + len, "status:\t\t%s\n", enabled(status, 1));
+                len += sprintf(p + len, "commands:\tenable, disable\n");
+        }
+
+        return len;
+}
+
+static int wan_write(char *buf)
+{
+        int status = wan_status();
+        char *cmd;
+        int do_cmd = 0;
+
+        if (!wan_supported)
+                return -ENODEV;
+
+        while ((cmd = next_cmd(&buf))) {
+                if (strlencmp(cmd, "enable") == 0) {
+                        status |= 2;
+                } else if (strlencmp(cmd, "disable") == 0) {
+                        status &= ~2;
+                } else
+                        return -EINVAL;
+                do_cmd = 1;
+        }
+
+        if (do_cmd && !acpi_evalf(hkey_handle, NULL, "SWAN", "vd", status))
+                return -EIO;
+
+        return 0;
+}
+
 static int video_supported;
 static int video_orig_autosw;
 
@@ -1563,6 +1626,13 @@ static struct ibm_struct ibms[] = {
          .write = bluetooth_write,
          },
         {
+         .name = "wan",
+         .init = wan_init,
+         .read = wan_read,
+         .write = wan_write,
+         .experimental = 1,
+         },
+        {
          .name = "video",
          .init = video_init,
          .read = video_read,