You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		18 years ago
..
Kconfig	Still more typo fixes	19 years ago
Makefile	ACPIPHP: use ACPI dock driver	19 years ago
acpi_pcihp.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
acpiphp.h	PCI: Change memory allocation for acpiphp slots	18 years ago
acpiphp_core.c	PCI: Change memory allocation for acpiphp slots	18 years ago
acpiphp_glue.c	acpiphp: fix use of list_for_each macro	18 years ago
acpiphp_ibm.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpci_hotplug.h	[PATCH] PCI Hotplug: CPCI update	20 years ago
cpci_hotplug_core.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpci_hotplug_pci.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpcihp_generic.c	cpcihp_generic: prevent loading without "bridge" parameter	19 years ago
cpcihp_zt5550.c	[PATCH] irq-flags: pci: Use the new IRQF_ constants	19 years ago
cpcihp_zt5550.h	Linux-2.6.12-rc2	20 years ago
cpqphp.h	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpqphp_core.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpqphp_ctrl.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpqphp_nvram.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpqphp_nvram.h	Linux-2.6.12-rc2	20 years ago
cpqphp_pci.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
cpqphp_sysfs.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
fakephp.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
ibmphp.h	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
ibmphp_core.c	[PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver	19 years ago
ibmphp_ebda.c	[PATCH] ibmphp: remove TRUE and FALSE	19 years ago
ibmphp_hpc.c	Fix misc .c/.h comment typos	18 years ago
ibmphp_pci.c	PCI: ibmphp_pci.c: fix NULL dereference	18 years ago
ibmphp_res.c	[PATCH] ibmphp: remove TRUE and FALSE	19 years ago
pci_hotplug_core.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
pciehp.h	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
pciehp_core.c	pciehp: remove unnecessary free_irq	18 years ago
pciehp_ctrl.c	pciehp: Remove unnecessary check in pciehp_ctrl.c	19 years ago
pciehp_hpc.c	pciehp: remove unnecessary pci_disable_msi	18 years ago
pciehp_pci.c	[PATCH] pciehp: Add missing pci_dev_put	19 years ago
pcihp_skeleton.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
rpadlpar.h	Linux-2.6.12-rc2	20 years ago
rpadlpar_core.c	PCI: rpaphp: change device tree examination	18 years ago
rpadlpar_sysfs.c	PCI Hotplug: move pci_hotplug.h to include/linux/	19 years ago
rpaphp.h	[PATCH] Fix up rpaphp driver for pci hotplug header move	19 years ago
rpaphp_core.c	PCI: rpaphp: change device tree examination	18 years ago
rpaphp_pci.c	[PATCH] powerpc/PCI hotplug: cleanup: add prefix	19 years ago
rpaphp_slot.c	[PATCH] PCI: kzalloc() conversion in drivers/pci	19 years ago
sgi_hotplug.c	Altix: SN ACPI hotplug support.	18 years ago
shpchp.h	WorkStruct: make allyesconfig	18 years ago
shpchp_core.c	WorkStruct: make allyesconfig	18 years ago
shpchp_ctrl.c	WorkStruct: make allyesconfig	18 years ago
shpchp_hpc.c	PCI hotplug: ioremap balanced with iounmap	19 years ago
shpchp_pci.c	[PATCH] acpi_pcihp: Add support for _HPX	19 years ago
shpchp_sysfs.c	SHPCHP: fix __must_check warnings	19 years ago