Merge branch 'pci/aspm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Dec 2016 17:25:01 +0000 (11:25 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 12 Dec 2016 17:25:01 +0000 (11:25 -0600)
commita7d51491110d039e42ea881aa4d9c08ea8b7d6ea
treeef9e649c3cb4156ac6507fabd3f045c788cd8566
parent1001354ca34179f3db924eb66672442a173147dc
parente53f9a28bee35932a0ae4d2ec2784f55491ec6d3
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