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

…

3c359.c

…

3c359.h

…

abyss.c

…

abyss.h

…

ibmtr.c

[PATCH] remote memory corruptor in ibmtr.c

2006-12-04 19:32:44 -08:00

Kconfig

…

lanstreamer.c

…

lanstreamer.h

…

madgemc.c

…

madgemc.h

…

Makefile

…

olympic.c

[PATCH] pci_module_init() convertion in olympic.c

2006-12-02 00:11:55 -05:00

olympic.h

…

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

…

smctr.c

[PATCH] trivial missing __init in drivers/net/*

2006-12-04 16:07:19 -05:00

smctr.h

…

tms380tr.c

…

tms380tr.h

…

tmspci.c

…