Merge branch 'pci/virtualization'
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 2 Apr 2020 19:26:45 +0000 (14:26 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 2 Apr 2020 19:26:45 +0000 (14:26 -0500)
commit1ee57ad69e1d00f9f3c355293751d67753302e0d
treec9287122aff192aace82a83494468e245b80ac3e
parent86845e37aca4c80eace290a727a49caa8390febb
parent299bd044a6f332b4a6c8f708575c27cad70a35c1
Merge branch 'pci/virtualization'

  - Add ACS quirks for Zhaoxin Root Ports, Downstream Ports, and
    multi-function devices (Raymond Pang)

* pci/virtualization:
  PCI: Add ACS quirk for Zhaoxin Root/Downstream Ports
  PCI: Add ACS quirk for Zhaoxin multi-function devices
  PCI: Add Zhaoxin Vendor ID
drivers/pci/quirks.c