Merge branch 'pci/joe-aspm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 2 Feb 2013 21:34:19 +0000 (14:34 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 2 Feb 2013 21:34:19 +0000 (14:34 -0700)
commitecb87e6609d3a559eacf7a61f5b4e088a797d07c
tree467eb9d56301a758a699fc6e1cb20de39248f76b
parent8e5de3dcc6bde513d0e3940ae317b85972f3de5a
parenta26d5ecb3201c11e03663a8f4a7dedc0c5f85c07
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