Jeff Garzik 75a95178da Merge upstream into 'upstream' branch of netdev-2.6.git. ...

Hand fix merge conflict in drivers/net/tokenring/Kconfig.

2005-08-24 01:03:34 -04:00

..

3c359_microcode.h

[PATCH] drivers/net/tokenring/: cleanups

2005-06-26 18:29:26 -04:00

3c359.c

[PATCH] drivers/net/tokenring/: cleanups

2005-06-26 18:29:26 -04:00

3c359.h

…

abyss.c

[netdrvr] Convert madgemc to new MCA API.

2005-08-19 21:05:56 -04:00

abyss.h

…

ibmtr.c

[PATCH] drivers/net/tokenring/: cleanups

2005-06-26 18:29:26 -04:00

Kconfig

Merge upstream into 'upstream' branch of netdev-2.6.git.

2005-08-24 01:03:34 -04:00

lanstreamer.c

[PATCH] net/lanstreamer: replace schedule_timeout() with ssleep()/msleep_interruptible()

2005-06-26 23:48:38 -04:00

lanstreamer.h

…

madgemc.c

[netdrvr] Convert madgemc to new MCA API.

2005-08-19 21:05:56 -04:00

madgemc.h

…

Makefile

…

olympic.c

…

olympic.h

…

proteon.c

[netdrvr] Convert madgemc to new MCA API.

2005-08-19 21:05:56 -04:00

skisa.c

[netdrvr] Convert madgemc to new MCA API.

2005-08-19 21:05:56 -04:00

smctr_firmware.h

[PATCH] drivers/net/tokenring/: cleanups

2005-06-26 18:29:26 -04:00

smctr.c

[PATCH] drivers/net/tokenring/: cleanups

2005-06-26 18:29:26 -04:00

smctr.h

…

tms380tr.c

[netdrvr] Convert madgemc to new MCA API.

2005-08-19 21:05:56 -04:00

tms380tr.h

[netdrvr] Convert madgemc to new MCA API.

2005-08-19 21:05:56 -04:00

tmspci.c

[netdrvr] Convert madgemc to new MCA API.

2005-08-19 21:05:56 -04:00