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, 9 insertions, 6 deletions

diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index 10ae6292bca4..aabe8794b908 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -76,19 +76,21 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
         union acpi_operand_object *last_obj_desc;
         acpi_object_type object_type = ACPI_TYPE_ANY;
 
-        ACPI_FUNCTION_TRACE("ns_attach_object");
+        ACPI_FUNCTION_TRACE(ns_attach_object);
 
         /*
          * Parameter validation
          */
         if (!node) {
+
                 /* Invalid handle */
 
-                ACPI_ERROR((AE_INFO, "Null named_obj handle"));
+                ACPI_ERROR((AE_INFO, "Null NamedObj handle"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         if (!object && (ACPI_TYPE_ANY != type)) {
+
                 /* Null object */
 
                 ACPI_ERROR((AE_INFO,
@@ -97,6 +99,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
+
                 /* Not a name handle */
 
                 ACPI_ERROR((AE_INFO, "Invalid handle %p [%s]",
@@ -108,7 +111,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
 
         if (node->object == object) {
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "Obj %p already installed in name_obj %p\n",
+                                  "Obj %p already installed in NameObj %p\n",
                                   object, node));
 
                 return_ACPI_STATUS(AE_OK);
@@ -201,7 +204,7 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
 {
         union acpi_operand_object *obj_desc;
 
-        ACPI_FUNCTION_TRACE("ns_detach_object");
+        ACPI_FUNCTION_TRACE(ns_detach_object);
 
         obj_desc = node->object;
 
@@ -252,7 +255,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
                                                        acpi_namespace_node
                                                        *node)
 {
-        ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node);
+        ACPI_FUNCTION_TRACE_PTR(ns_get_attached_object, node);
 
         if (!node) {
                 ACPI_WARNING((AE_INFO, "Null Node ptr"));
@@ -287,7 +290,7 @@ union acpi_operand_object *acpi_ns_get_secondary_object(union
                                                         acpi_operand_object
                                                         *obj_desc)
 {
-        ACPI_FUNCTION_TRACE_PTR("ns_get_secondary_object", obj_desc);
+        ACPI_FUNCTION_TRACE_PTR(ns_get_secondary_object, obj_desc);
 
         if ((!obj_desc) ||
             (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_DATA) ||