Merge branch 'pci/aspm'
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:09 +0000 (12:59 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:09 +0000 (12:59 -0500)
  - Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges (Kai-Heng Feng)

* pci/aspm:
  PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges


Trivial merge