Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

Pul ACPI & Power Management updates from Len Brown:
 - acpidump utility added
 - intel_idle driver now supports IVB Xeon
 - turbostat utility can now count SMIs
 - ACPI can now bind to USB3 hubs
 - misc fixes

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (49 commits)
  ACPI: Add new sysfs interface to export device description
  ACPI: Harden acpi_table_parse_entries() against BIOS bug
  tools/power/turbostat: add option to count SMIs, re-name some options
  tools/power turbostat: add [-d MSR#][-D MSR#] options to print counter deltas
  intel_idle: enable IVB Xeon support
  tools/power turbostat: add [-m MSR#] option
  tools/power turbostat: make -M output pretty
  tools/power turbostat: print more turbo-limit information
  tools/power turbostat: delete unused line
  tools/power turbostat: run on IVB Xeon
  tools/power/acpi/acpidump: create acpidump(8), local make install targets
  tools/power/acpi/acpidump: version 20101221 - find dynamic tables in sysfs
  ACPI: run _OSC after ACPI_FULL_INITIALIZATION
  tools/power/acpi/acpidump: create acpidump(8), local make install targets
  tools/power/acpi/acpidump: version 20101221 - find dynamic tables in sysfs
  tools/power/acpi/acpidump: version 20071116
  tools/power/acpi/acpidump: version 20070714
  tools/power/acpi/acpidump: version 20060606
  tools/power/acpi/acpidump: version 20051111
  xo15-ebook: convert to module_acpi_driver()
  ...

1 files changed, 37 insertions, 20 deletions

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 251c7b6273a9..27adb090bb30 100644
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -302,26 +302,41 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
         list_for_each_safe(node, next, &acpi_wakeup_device_list) {
                 struct acpi_device *dev =
                     container_of(node, struct acpi_device, wakeup_list);
-                struct device *ldev;
+                struct acpi_device_physical_node *entry;
 
                 if (!dev->wakeup.flags.valid)
                         continue;
 
-                ldev = acpi_get_physical_device(dev->handle);
-                seq_printf(seq, "%s\t  S%d\t%c%-8s  ",
+                seq_printf(seq, "%s\t  S%d\t",
                            dev->pnp.bus_id,
-                           (u32) dev->wakeup.sleep_state,
-                           dev->wakeup.flags.run_wake ? '*' : ' ',
-                           (device_may_wakeup(&dev->dev)
-                             || (ldev && device_may_wakeup(ldev))) ?
-                               "enabled" : "disabled");
-                if (ldev)
-                        seq_printf(seq, "%s:%s",
-                                   ldev->bus ? ldev->bus->name : "no-bus",
-                                   dev_name(ldev));
-                seq_printf(seq, "\n");
-                put_device(ldev);
-
+                           (u32) dev->wakeup.sleep_state);
+
+                if (!dev->physical_node_count)
+                        seq_printf(seq, "%c%-8s\n",
+                                dev->wakeup.flags.run_wake ?
+                                '*' : ' ', "disabled");
+                else {
+                        struct device *ldev;
+                        list_for_each_entry(entry, &dev->physical_node_list,
+                                        node) {
+                                ldev = get_device(entry->dev);
+                                if (!ldev)
+                                        continue;
+
+                                if (&entry->node !=
+                                                dev->physical_node_list.next)
+                                        seq_printf(seq, "\t\t");
+
+                                seq_printf(seq, "%c%-8s  %s:%s\n",
+                                        dev->wakeup.flags.run_wake ? '*' : ' ',
+                                        (device_may_wakeup(&dev->dev) ||
+                                        (ldev && device_may_wakeup(ldev))) ?
+                                        "enabled" : "disabled",
+                                        ldev->bus ? ldev->bus->name :
+                                        "no-bus", dev_name(ldev));
+                                put_device(ldev);
+                        }
+                }
         }
         mutex_unlock(&acpi_device_lock);
         return 0;
@@ -329,12 +344,14 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 
 static void physical_device_enable_wakeup(struct acpi_device *adev)
 {
-        struct device *dev = acpi_get_physical_device(adev->handle);
+        struct acpi_device_physical_node *entry;
 
-        if (dev && device_can_wakeup(dev)) {
-                bool enable = !device_may_wakeup(dev);
-                device_set_wakeup_enable(dev, enable);
-        }
+        list_for_each_entry(entry,
+                &adev->physical_node_list, node)
+                if (entry->dev && device_can_wakeup(entry->dev)) {
+                        bool enable = !device_may_wakeup(entry->dev);
+                        device_set_wakeup_enable(entry->dev, enable);
+                }
 }
 
 static ssize_t