Linus Torvalds 78149df6d5 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (41 commits) Revert "PCI: remove duplicate device id from ata_piix" msi: Make MSI useable more architectures msi: Kill the msi_desc array. msi: Remove attach_msi_entry. msi: Fix msi_remove_pci_irq_vectors. msi: Remove msi_lock. msi: Kill msi_lookup_irq MSI: Combine pci_(save|restore)_msi/msix_state MSI: Remove pci_scan_msi_device() MSI: Replace pci_msi_quirk with calls to pci_no_msi() PCI: remove duplicate device id from ipr PCI: remove duplicate device id from ata_piix PCI: power management: remove noise on non-manageable hw PCI: cleanup MSI code PCI: make isa_bridge Alpha-only PCI: remove quirk_sis_96x_compatible() PCI: Speed up the Intel SMBus unhiding quirk PCI Quirk: 1k I/O space IOBL_ADR fix on P64H2 shpchp: delete trailing whitespace shpchp: remove DBG_XXX_ROUTINE ...		2007-02-07 19:23:44 -08:00
..
acpi_pcihp.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
acpiphp_core.c	PCI: Change memory allocation for acpiphp slots	2006-12-01 14:36:59 -08:00
acpiphp_glue.c	ACPICA: Remove duplicate table definitions (non-conflicting), cont	2007-02-02 21:14:29 -05:00
acpiphp_ibm.c	ACPI: replace kmalloc+memset with kzalloc	2006-12-20 16:54:54 -05:00
acpiphp.h	PCI: Change memory allocation for acpiphp slots	2006-12-01 14:36:59 -08:00
cpci_hotplug_core.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
cpci_hotplug_pci.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
cpci_hotplug.h
cpcihp_generic.c	cpcihp_generic: prevent loading without "bridge" parameter	2006-10-18 11:36:12 -07:00
cpcihp_zt5550.c
cpcihp_zt5550.h
cpqphp_core.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
cpqphp_ctrl.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
cpqphp_nvram.c	[PATCH] getting rid of all casts of k[cmz]alloc() calls	2006-12-13 09:05:58 -08:00
cpqphp_nvram.h
cpqphp_pci.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
cpqphp_sysfs.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
cpqphp.h	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
fakephp.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
ibmphp_core.c
ibmphp_ebda.c
ibmphp_hpc.c	Fix misc .c/.h comment typos	2006-11-30 05:24:39 +01:00
ibmphp_pci.c	PCI: ibmphp_pci.c: fix NULL dereference	2006-12-01 14:37:00 -08:00
ibmphp_res.c
ibmphp.h	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
Kconfig	shpchp: remove CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE	2007-02-07 15:50:05 -08:00
Makefile
pci_hotplug_core.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
pciehp_core.c	PCIEHP: Add Electro Mechanical Interlock (EMI) support to the PCIE hotplug driver.	2007-02-07 15:50:05 -08:00
pciehp_ctrl.c	pciehp: cleanup wait command completion	2007-02-07 15:50:05 -08:00
pciehp_hpc.c	PCIEHP: Add Electro Mechanical Interlock (EMI) support to the PCIE hotplug driver.	2007-02-07 15:50:05 -08:00
pciehp_pci.c
pciehp.h	PCIEHP: Add Electro Mechanical Interlock (EMI) support to the PCIE hotplug driver.	2007-02-07 15:50:05 -08:00
pcihp_skeleton.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
rpadlpar_core.c	PCI: rpaphp: change device tree examination	2006-12-01 14:36:59 -08:00
rpadlpar_sysfs.c	PCI Hotplug: move pci_hotplug.h to include/linux/	2006-10-18 11:36:12 -07:00
rpadlpar.h
rpaphp_core.c	PCI: rpaphp: change device tree examination	2006-12-01 14:36:59 -08:00
rpaphp_pci.c
rpaphp_slot.c	rpaphp: compiler warning cleanup	2006-12-20 10:54:42 -08:00
rpaphp.h	[PATCH] Fix up rpaphp driver for pci hotplug header move	2006-10-20 17:56:39 -07:00
sgi_hotplug.c	Altix: Add ACPI SSDT PCI device support (hotplug)	2007-02-02 22:14:57 -05:00
shpchp_core.c	shpchp: remove CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE	2007-02-07 15:50:05 -08:00
shpchp_ctrl.c	shpchp: delete trailing whitespace	2007-02-07 15:50:05 -08:00
shpchp_hpc.c	shpchp: delete trailing whitespace	2007-02-07 15:50:05 -08:00
shpchp_pci.c
shpchp_sysfs.c
shpchp.h	shpchp: delete trailing whitespace	2007-02-07 15:50:05 -08:00