kevin/linux
1
Fork 0
Code
5dbda701fe
linux/drivers/pci/hotplug
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00: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 acpiphp: fix use of list_for_each macro 2006-12-01 14:36:58 -08:00
acpiphp_ibm.c PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07: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 [PATCH] irq-flags: pci: Use the new IRQF_ constants 2006-07-02 13:58:52 -07:00
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 PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07: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 [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver 2006-06-19 14:13:24 -07:00
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 Still more typo fixes 2006-10-03 22:36:44 +02:00
Makefile ACPIPHP: use ACPI dock driver 2006-06-28 03:08:06 -04:00
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: remove unnecessary free_irq 2006-12-01 14:36:59 -08:00
pciehp_ctrl.c pciehp: Remove unnecessary check in pciehp_ctrl.c 2006-10-18 11:36:10 -07:00
pciehp_hpc.c pciehp: remove unnecessary pci_disable_msi 2006-12-01 14:37:00 -08:00
pciehp_pci.c
pciehp.h PCI Hotplug: move pci_hotplug.h to include/linux/ 2006-10-18 11:36:12 -07: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.h [PATCH] Fix up rpaphp driver for pci hotplug header move 2006-10-20 17:56:39 -07:00
sgi_hotplug.c Altix: SN ACPI hotplug support. 2006-12-01 14:36:58 -08:00
shpchp_core.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
shpchp_ctrl.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
shpchp_hpc.c PCI hotplug: ioremap balanced with iounmap 2006-10-18 11:36:11 -07:00
shpchp_pci.c
shpchp_sysfs.c SHPCHP: fix __must_check warnings 2006-09-26 17:43:53 -07:00
shpchp.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00