Joerg Roedel 00fb5430f5 Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next ... Conflicts: drivers/pci/hotplug/acpiphp_glue.c		2012-01-09 13:04:05 +01:00
..
acpi_pcihp.c
acpiphp_core.c
acpiphp_glue.c	PCI: Set device power state to PCI_D0 for device without native PM support	2011-12-14 08:26:42 -08:00
acpiphp_ibm.c
acpiphp.h
cpci_hotplug_core.c
cpci_hotplug_pci.c
cpci_hotplug.h
cpcihp_generic.c
cpcihp_zt5550.c
cpcihp_zt5550.h
cpqphp_core.c
cpqphp_ctrl.c
cpqphp_nvram.c
cpqphp_nvram.h
cpqphp_pci.c
cpqphp_sysfs.c
cpqphp.h
fakephp.c
ibmphp_core.c
ibmphp_ebda.c
ibmphp_hpc.c
ibmphp_pci.c
ibmphp_res.c
ibmphp.h
Kconfig
Makefile
pci_hotplug_core.c
pciehp_acpi.c
pciehp_core.c	PCI: pciehp: Handle push button event asynchronously	2011-12-05 10:21:47 -08:00
pciehp_ctrl.c	PCI: pciehp: Handle push button event asynchronously	2011-12-05 10:21:47 -08:00
pciehp_hpc.c	PCI: pciehp: Handle push button event asynchronously	2011-12-05 10:21:47 -08:00
pciehp_pci.c
pciehp.h	PCI: pciehp: Handle push button event asynchronously	2011-12-05 10:21:47 -08:00
pcihp_skeleton.c
pcihp_slot.c
rpadlpar_core.c
rpadlpar_sysfs.c
rpadlpar.h
rpaphp_core.c
rpaphp_pci.c
rpaphp_slot.c
rpaphp.h
sgi_hotplug.c
shpchp_core.c
shpchp_ctrl.c
shpchp_hpc.c
shpchp_pci.c
shpchp_sysfs.c
shpchp.h