tree c8e7b57382628873a26b15fbda1f41b527ad1c0b
parent 56a9ccb7ba5ffd5f285e3a9628cb446192c8639c
parent eca67315e0e0d5fd91264d79c88694006dbc7d31
author Linus Torvalds <torvalds@linux-foundation.org> 1301112103 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301112103 -0700

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