diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 14:34:19 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 14:34:19 -0700 |
| commit | ecb87e6609d3a559eacf7a61f5b4e088a797d07c (patch) | |
| tree | 467eb9d56301a758a699fc6e1cb20de39248f76b /drivers/pci/pci.c | |
| parent | Merge branch 'pci/yinghai-root-bus-hotplug' into next (diff) | |
| parent | PCI/ASPM: Don't touch ASPM if forcibly disabled (diff) | |
| download | linux-dev-ecb87e6609d3a559eacf7a61f5b4e088a797d07c.tar.xz linux-dev-ecb87e6609d3a559eacf7a61f5b4e088a797d07c.zip | |
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
Diffstat (limited to 'drivers/pci/pci.c')
0 files changed, 0 insertions, 0 deletions