From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 12 Dec 2016 17:25:01 +0000 (-0600)
Subject: Merge branch 'pci/aspm' into next
X-Git-Tag: pci-v4.10-changes~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a7d51491110d039e42ea881aa4d9c08ea8b7d6ea;p=users%2Fdwmw2%2Flinux.git

Merge branch 'pci/aspm' into next

* pci/aspm:
  PCI/ASPM: Don't retrain link if ASPM not possible
  PCI/ASPM: Use permission-specific DEVICE_ATTR variants
---

a7d51491110d039e42ea881aa4d9c08ea8b7d6ea