| commit | 14b5cb37cc6172a54ce920c61784f44422ae306d | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Sat Jan 26 17:27:36 2013 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Sat Jan 26 17:27:36 2013 -0700 |
| tree | 53e500c8aec98e645079e025c2525ce399052e1d | |
| parent | 708b59bfe1d1727451ca41f5dc4c17cf99dfaf51 [diff] | |
| parent | fcbed0bcb216b9f134e8614f46e00649a179e042 [diff] |
Merge branch 'pci/yijing-ari' into next * pci/yijing-ari: PCI: shpchp: Iterate over all devices in slot, not functions 0-7 PCI: sgihp: Iterate over all devices in slot, not functions 0-7 PCI: cpcihp: Iterate over all devices in slot, not functions 0-7 PCI: pciehp: Iterate over all devices in slot, not functions 0-7 PCI: Consolidate "next-function" functions PCI: Rename pci_enable_ari() to pci_configure_ari() PCI: Enable ARI if dev and upstream bridge support it; disable otherwise