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

diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 3f020c0e2b95..0456405ba019 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -82,7 +82,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 {
         u32 i;
 
-        ACPI_FUNCTION_TRACE_PTR("ex_do_debug_object", source_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT, "[ACPI Debug] %*s",
                               level, " "));
@@ -245,7 +245,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
         acpi_status status = AE_OK;
         union acpi_operand_object *ref_desc = dest_desc;
 
-        ACPI_FUNCTION_TRACE_PTR("ex_store", dest_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_store, dest_desc);
 
         /* Validate parameters */
 
@@ -297,7 +297,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
                 ACPI_DUMP_STACK_ENTRY(source_desc);
                 ACPI_DUMP_STACK_ENTRY(dest_desc);
-                ACPI_DUMP_OPERANDS(&dest_desc, ACPI_IMODE_EXECUTE, "ex_store",
+                ACPI_DUMP_OPERANDS(&dest_desc, ACPI_IMODE_EXECUTE, "ExStore",
                                    2,
                                    "Target is not a Reference or Constant object");
 
@@ -396,7 +396,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
         u8 value = 0;
         u32 i;
 
-        ACPI_FUNCTION_TRACE("ex_store_object_to_index");
+        ACPI_FUNCTION_TRACE(ex_store_object_to_index);
 
         /*
          * Destination must be a reference pointer, and
@@ -423,6 +423,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                 }
 
                 if (obj_desc) {
+
                         /* Decrement reference count by the ref count of the parent package */
 
                         for (i = 0; i < ((union acpi_operand_object *)
@@ -502,8 +503,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                 break;
 
         default:
-                ACPI_ERROR((AE_INFO,
-                            "Target is not a Package or buffer_field"));
+                ACPI_ERROR((AE_INFO, "Target is not a Package or BufferField"));
                 status = AE_AML_OPERAND_TYPE;
                 break;
         }
@@ -548,7 +548,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
         union acpi_operand_object *new_desc;
         acpi_object_type target_type;
 
-        ACPI_FUNCTION_TRACE_PTR("ex_store_object_to_node", source_desc);
+        ACPI_FUNCTION_TRACE_PTR(ex_store_object_to_node, source_desc);
 
         /* Get current type of the node, and object attached to Node */
 
@@ -572,6 +572,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
         /* If no implicit conversion, drop into the default case below */
 
         if ((!implicit_conversion) || (walk_state->opcode == AML_COPY_OP)) {
+
                 /* Force execution of default (no implicit conversion) */
 
                 target_type = ACPI_TYPE_ANY;