David S. Miller 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c

2009-03-05 02:06:47 -08:00

..

3c359_microcode.h

…

3c359.c

3c559: convert to net_device_ops

2009-01-21 14:02:31 -08:00

3c359.h

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-05-25 23:26:10 -07:00

abyss.c

tms380tr: convert to net_device_ops

2009-01-21 14:02:30 -08:00

abyss.h

MAINTAINERS: remove Adam Fritzler, remove his email address in other sources

2008-02-03 16:36:24 +02:00

ibmtr.c

ibmtr: convert to net_device_ops

2009-01-21 14:02:26 -08:00

Kconfig

net: Allow dependancies of FDDI & Tokenring to be modular.

2008-12-27 20:43:48 -08:00

lanstreamer.c

drivers/net/tokenring: fix sparse warning: symbol shadows an earlier one

2009-02-17 17:38:01 -08:00

lanstreamer.h

lanstreamer: convert to internal network stats

2009-01-21 14:02:27 -08:00

madgemc.c

drivers/net/tokenring: fix sparse warning: symbol shadows an earlier one

2009-02-17 17:38:01 -08:00

madgemc.h

MAINTAINERS: remove Adam Fritzler, remove his email address in other sources

2008-02-03 16:36:24 +02:00

Makefile

…

olympic.c

drivers/net/tokenring: fix sparse warning: symbol shadows an earlier one

2009-02-17 17:38:01 -08:00

olympic.h

olympic: convert to internal network device stats

2009-01-21 14:02:29 -08:00

proteon.c

drivers/net/tokenring: fix sparse warnings: make symbols static

2008-12-26 00:07:15 -08:00

skisa.c

drivers/net/tokenring: fix sparse warnings: make symbols static

2008-12-26 00:07:15 -08:00

smctr.c

drivers/net/tokenring: fix sparse warning: cast truncates bits from const value

2009-02-17 19:49:21 -08:00

smctr.h

drivers/net/tokenring: fix sparse warning: cast truncates bits from const value

2009-02-17 19:49:21 -08:00

tms380tr.c

tms380tr: convert to net_device_ops

2009-01-21 14:02:30 -08:00

tms380tr.h

tms380tr: convert to net_device_ops

2009-01-21 14:02:30 -08:00

tmspci.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-05 02:06:47 -08:00