Len Brown 02e2407858 Merge branch 'linus' into release ...

Conflicts:
	arch/x86/kernel/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>

2011-03-23 02:34:54 -04:00

..

aer_inject.c

PCI: aer-inject: Override PCIe AER Mask Registers

2011-03-04 10:41:02 -08:00

aerdrv_acpi.c

PCI/PCIe/AER: Disable native AER service if BIOS has precedence

2010-10-15 13:09:50 -07:00

aerdrv_core.c

PCI: aerdrv: fix uninitialized variable warning

2010-10-15 13:09:48 -07:00

aerdrv_errprint.c

ACPI, APEI, Add PCIe AER error information printing support

2011-03-21 22:59:08 -04:00

aerdrv.c

PCI/ACPI: Request _OSC control once for each root bridge (v3)

2011-01-14 08:55:41 -08:00

aerdrv.h

ACPI, APEI, Add PCIe AER error information printing support

2011-03-21 22:59:08 -04:00

ecrc.c

PCIe AER: use pci_is_pcie()

2009-11-24 15:25:17 -08:00

Kconfig

PCI AER: software error injection

2009-06-16 14:30:14 -07:00

Kconfig.debug

PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)

2009-12-16 13:37:54 -08:00

Makefile

PCI AER: software error injection

2009-06-16 14:30:14 -07:00