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	PCI hotplug: Rename is_ejectable which also exists in dock.c	2011-07-22 08:25:35 -07:00
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	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
cpci_hotplug_pci.c
cpci_hotplug.h
cpcihp_generic.c
cpcihp_zt5550.c
cpcihp_zt5550.h
cpqphp_core.c	PCI hotplug: cpqphp: use pci_dev->vendor	2011-07-22 08:25:43 -07:00
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	pci: add module.h to files implicitly relying on its presence.	2011-10-31 19:31:23 -04:00
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	pci: Fix files needing export.h for EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:22 -04:00
rpadlpar_core.c	pci: add module.h to files implicitly relying on its presence.	2011-10-31 19:31:23 -04:00
rpadlpar_sysfs.c
rpadlpar.h
rpaphp_core.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
rpaphp_pci.c
rpaphp_slot.c
rpaphp.h
sgi_hotplug.c
shpchp_core.c	PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs	2011-11-14 09:43:14 -08:00
shpchp_ctrl.c
shpchp_hpc.c	PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs	2011-11-14 09:43:14 -08:00
shpchp_pci.c
shpchp_sysfs.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
shpchp.h