From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 2 Feb 2013 21:34:19 +0000 (-0700)
Subject: Merge branch 'pci/joe-aspm' into next
X-Git-Tag: firefly_0821_release~3680^2~1035^2~5
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ecb87e6609d3a559eacf7a61f5b4e088a797d07c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/joe-aspm' into next

* pci/joe-aspm:
  PCI/ASPM: Don't touch ASPM if forcibly disabled
  PCI/ASPM: Deallocate upstream link state even if device is not PCIe
---

ecb87e6609d3a559eacf7a61f5b4e088a797d07c