Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 31122214e0ec..1af808171d46 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -389,6 +389,17 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
 
                 pbus = pdev->subordinate;
                 pci_dev_put(pdev);
+
+                /*
+                 * This function may be called for a non-PCI device that has a
+                 * PCI parent (eg. a disk under a PCI SATA controller).  In that
+                 * case pdev->subordinate will be NULL for the parent.
+                 */
+                if (!pbus) {
+                        dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n");
+                        pdev = NULL;
+                        break;
+                }
         }
 out:
         list_for_each_entry_safe(node, tmp, &device_list, node)