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, 4 insertions, 4 deletions

diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index 9a622169008a..8106215ad554 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -69,7 +69,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
         struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;
         u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
 
-        ACPI_FUNCTION_TRACE("ev_sci_xrupt_handler");
+        ACPI_FUNCTION_TRACE(ev_sci_xrupt_handler);
 
         /*
          * We are guaranteed by the ACPI CA initialization/shutdown code that
@@ -108,7 +108,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
         struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;
         u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
 
-        ACPI_FUNCTION_TRACE("ev_gpe_xrupt_handler");
+        ACPI_FUNCTION_TRACE(ev_gpe_xrupt_handler);
 
         /*
          * We are guaranteed by the ACPI CA initialization/shutdown code that
@@ -140,7 +140,7 @@ u32 acpi_ev_install_sci_handler(void)
 {
         u32 status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("ev_install_sci_handler");
+        ACPI_FUNCTION_TRACE(ev_install_sci_handler);
 
         status = acpi_os_install_interrupt_handler((u32) acpi_gbl_FADT->sci_int,
                                                    acpi_ev_sci_xrupt_handler,
@@ -171,7 +171,7 @@ acpi_status acpi_ev_remove_sci_handler(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_remove_sci_handler");
+        ACPI_FUNCTION_TRACE(ev_remove_sci_handler);
 
         /* Just let the OS remove the handler and disable the level */