| commit | cf2d804110d3c20dc6865ade514c44179de34855 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Thu Sep 07 13:24:41 2017 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Thu Sep 07 13:24:41 2017 -0500 |
| tree | 5c2281d54c5c77ee2806ea7123beb66e99ab34b0 | |
| parent | 27e87395ae3497ebb63942150e43999c93a83ed0 [diff] | |
| parent | 0fc690a7c3f7053613dcbab6a7613bb6586d8ee2 [diff] |
Merge branch 'pci/virtualization' into next * pci/virtualization: PCI: Disable VF decoding before pcibios_sriov_disable() updates resources PCI: Add ACS quirk for APM X-Gene devices PCI: Mark AMD Stoney GPU ATS as broken Conflicts: drivers/pci/quirks.c