From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 2 Apr 2020 19:26:45 +0000 (-0500)
Subject: Merge branch 'pci/virtualization'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1ee57ad69e1d00f9f3c355293751d67753302e0d;p=linux.git

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
---

1ee57ad69e1d00f9f3c355293751d67753302e0d