summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ohci-tmio.c
diff options
context:
space:
mode:
authorBjorn Helgaas2017-09-07 20:24:41 +0200
committerBjorn Helgaas2017-09-07 20:24:41 +0200
commitcf2d804110d3c20dc6865ade514c44179de34855 (patch)
tree5c2281d54c5c77ee2806ea7123beb66e99ab34b0 /drivers/usb/host/ohci-tmio.c
parentMerge branch 'pci/trivial' into next (diff)
parentPCI: Disable VF decoding before pcibios_sriov_disable() updates resources (diff)
downloadkernel-qcow2-linux-cf2d804110d3c20dc6865ade514c44179de34855.tar.gz
kernel-qcow2-linux-cf2d804110d3c20dc6865ade514c44179de34855.tar.xz
kernel-qcow2-linux-cf2d804110d3c20dc6865ade514c44179de34855.zip
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/usb/host/ohci-tmio.c')
0 files changed, 0 insertions, 0 deletions