q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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
..
Kconfig Still more typo fixes 2006-10-03 22:36:44 +02:00
Makefile
…
acpi_pcihp.c
…
acpiphp.h PCI: Change memory allocation for acpiphp slots 2006-12-01 14:36:59 -08: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
…
cpci_hotplug.h
…
cpci_hotplug_core.c
…
cpci_hotplug_pci.c
…
cpcihp_generic.c
…
cpcihp_zt5550.c
…
cpcihp_zt5550.h
…
cpqphp.h
…
cpqphp_core.c
…
cpqphp_ctrl.c
…
cpqphp_nvram.c
…
cpqphp_nvram.h
…
cpqphp_pci.c
…
cpqphp_sysfs.c
…
fakephp.c
…
ibmphp.h
…
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
…
pci_hotplug_core.c
…
pciehp.h
…
pciehp_core.c pciehp: remove unnecessary free_irq 2006-12-01 14:36:59 -08:00
pciehp_ctrl.c
…
pciehp_hpc.c pciehp: remove unnecessary pci_disable_msi 2006-12-01 14:37:00 -08:00
pciehp_pci.c
…
pcihp_skeleton.c
…
rpadlpar.h
…
rpadlpar_core.c PCI: rpaphp: change device tree examination 2006-12-01 14:36:59 -08:00
rpadlpar_sysfs.c
…
rpaphp.h
…
rpaphp_core.c PCI: rpaphp: change device tree examination 2006-12-01 14:36:59 -08:00
rpaphp_pci.c
…
rpaphp_slot.c
…
sgi_hotplug.c Altix: SN ACPI hotplug support. 2006-12-01 14:36:58 -08:00
shpchp.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00: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
…
shpchp_pci.c
…
shpchp_sysfs.c
…