tree 467eb9d56301a758a699fc6e1cb20de39248f76b
parent 8e5de3dcc6bde513d0e3940ae317b85972f3de5a
parent a26d5ecb3201c11e03663a8f4a7dedc0c5f85c07
author Bjorn Helgaas <bhelgaas@google.com> 1359840859 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1359840859 -0700

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