From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 9 Nov 2012 17:00:07 +0000 (-0700)
Subject: Merge branch 'pci/taku-prt-cleanup' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=05508270064efd674e8f2a047911dcd7776aaae0;p=deliverable%2Flinux.git

Merge branch 'pci/taku-prt-cleanup' into next

* pci/taku-prt-cleanup:
  PCI/ACPI: Request _OSC control before scanning PCI root bus
  PCI: Don't pass pci_dev to pci_ext_cfg_avail()
  PCI/ACPI: Add _PRT interrupt routing info before enumerating devices
  ACPI: Pass segment/bus to _PRT add/del so they don't depend on pci_bus
---

05508270064efd674e8f2a047911dcd7776aaae0