Jeff Garzik 8d1413b280 Merge branch 'master' into upstream ... Conflicts: drivers/net/netxen/netxen_nic.h drivers/net/netxen/netxen_nic_main.c		2006-12-07 04:57:19 -05:00
..
3c359_microcode.h	[PATCH] drivers/net/tokenring/: cleanups	2005-06-26 18:29:26 -04:00
3c359.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
3c359.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
abyss.c	[PATCH] irq-flags: drivers/net: Use the new IRQF_ constants	2006-07-02 13:58:51 -07:00
abyss.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ibmtr.c	[PATCH] remote memory corruptor in ibmtr.c	2006-12-04 19:32:44 -08:00
Kconfig	[PATCH] uml: kconfigs	2006-03-31 12:18:51 -08:00
lanstreamer.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
lanstreamer.h	[PATCH] drivers/net/tokenring/lanstreamer.h Removal of old code	2006-09-25 20:01:19 -04:00
madgemc.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
madgemc.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
olympic.c	[PATCH] pci_module_init() convertion in olympic.c	2006-12-02 00:11:55 -05:00
olympic.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
proteon.c	[PATCH] tokenring: fix module_init error handling	2006-10-31 20:22:05 -05:00
skisa.c	[PATCH] tokenring: fix module_init error handling	2006-10-31 20:22:05 -05:00
smctr_firmware.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
smctr.c	[PATCH] trivial missing __init in drivers/net/*	2006-12-04 16:07:19 -05:00
smctr.h	[PATCH] smctr warning fix	2006-02-17 16:16:21 -05:00
tms380tr.c	drivers/net: eliminate irq handler impossible checks, needless casts	2006-10-06 14:56:04 -04:00
tms380tr.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
tmspci.c	BUG_ON cleanup in drivers/net/tokenring/	2006-10-03 23:34:11 +02:00