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.

Jeff Garzik 8d1413b280 Merge branch 'master' into upstream ... Conflicts: drivers/net/netxen/netxen_nic.h drivers/net/netxen/netxen_nic_main.c		18 years ago
..
3c359.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	19 years ago
3c359.h	…
3c359_microcode.h	…
Kconfig	…
Makefile	…
abyss.c	[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants	19 years ago
abyss.h	…
ibmtr.c	[PATCH] remote memory corruptor in ibmtr.c	18 years ago
lanstreamer.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	19 years ago
lanstreamer.h	[PATCH] drivers/net/tokenring/lanstreamer.h Removal of old code	19 years ago
madgemc.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	19 years ago
madgemc.h	…
olympic.c	[PATCH] pci_module_init() convertion in olympic.c	18 years ago
olympic.h	…
proteon.c	[PATCH] tokenring: fix module_init error handling	19 years ago
skisa.c	[PATCH] tokenring: fix module_init error handling	19 years ago
smctr.c	[PATCH] trivial missing __init in drivers/net/*	18 years ago
smctr.h	…
smctr_firmware.h	Remove obsolete #include <linux/config.h>	19 years ago
tms380tr.c	drivers/net: eliminate irq handler impossible checks, needless casts	19 years ago
tms380tr.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	19 years ago
tmspci.c	BUG_ON cleanup in drivers/net/tokenring/	19 years ago