summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:24:41 -0500
committerBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:24:41 -0500
commitcf2d804110d3c20dc6865ade514c44179de34855 (patch)
tree5c2281d54c5c77ee2806ea7123beb66e99ab34b0 /drivers/misc
parent27e87395ae3497ebb63942150e43999c93a83ed0 (diff)
parent0fc690a7c3f7053613dcbab6a7613bb6586d8ee2 (diff)
downloadlinux-cf2d804110d3c20dc6865ade514c44179de34855.tar.bz2
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
Diffstat (limited to 'drivers/misc')
0 files changed, 0 insertions, 0 deletions