| commit | 5aafdea448fb86412a6f8e46df518c1545d32436 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 25 21:01:43 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 25 21:01:43 2011 -0700 |
| tree | c8e7b57382628873a26b15fbda1f41b527ad1c0b | |
| parent | 56a9ccb7ba5ffd5f285e3a9628cb446192c8639c [diff] | |
| parent | eca67315e0e0d5fd91264d79c88694006dbc7d31 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: Disable ASPM when _OSC control is not granted for PCIe services PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs PCI: PCIe links may not get configured for ASPM under POWERSAVE mode PCI/ACPI: Report ASPM support to BIOS if not disabled from command line