| commit | 05508270064efd674e8f2a047911dcd7776aaae0 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Nov 09 10:00:07 2012 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Nov 09 10:00:07 2012 -0700 |
| tree | 87ae59fbeb5ad6d3d0d155e1b85436a9047458a0 | |
| parent | fa20f6f240e127bc914ca980a4b10c723c55fec9 [diff] | |
| parent | 8c33f51df406e1a1f7fa4e9b244845b7ebd61fa6 [diff] |
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