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 /kernel/futex_compat.c | |
| parent | 8e5de3dcc6bde513d0e3940ae317b85972f3de5a (diff) | |
| parent | a26d5ecb3201c11e03663a8f4a7dedc0c5f85c07 (diff) | |
| download | linux-ecb87e6609d3a559eacf7a61f5b4e088a797d07c.tar.bz2 | |
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 'kernel/futex_compat.c')
0 files changed, 0 insertions, 0 deletions