]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit98695c34c037f32cae34622b6d199050741da12c
tree467eb9d56301a758a699fc6e1cb20de39248f76b
parenta0ccb07c10ea5abee6b721c0cf29ec2175e964f7
parent1248790de16262fd6d08df593685c6852966ef47
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