[git pull] PCI fixes

Jesse Barnes
2011-03-25T17:22:40Z

The following changes since commit
a44f99c7efdb88fa41128065c9a9445c19894e34:

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (2011-03-20 18:14:55 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

A few misc. fixes.

Naga Chumbalkar (3):
PCI: PCIe links may not get configured for ASPM under POWERSAVE mode
PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs
PCI: Disable ASPM when _OSC control is not granted for PCIe services

Rafael J. Wysocki (1):
PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

drivers/acpi/pci_root.c | 11 ++++++++---
drivers/pci/pci.c | 6 ++++++
drivers/pci/pcie/aspm.c | 33 +++++++++++++++++++++++++++++++++
drivers/pci/pcie/portdrv_core.c | 5 +----
include/linux/pci-aspm.h | 4 ++++
include/linux/pci.h | 7 +++----
6 files changed, 55 insertions(+), 11 deletions(-)