]> git.ipfire.org Git - people/arne_f/kernel.git/commit
projects / people / arne_f / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27e8739 0fc690a)
Merge branch 'pci/virtualization' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:41 +0000 (13:24 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:41 +0000 (13:24 -0500)
commitcf2d804110d3c20dc6865ade514c44179de34855
tree5c2281d54c5c77ee2806ea7123beb66e99ab34b0tree | snapshot
parent27e87395ae3497ebb63942150e43999c93a83ed0commit | diff
parent0fc690a7c3f7053613dcbab6a7613bb6586d8ee2commit | 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
drivers/pci/quirks.c diff1 | diff2 | blob | history
Arne's tree of linux kernel.