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

…

3c359.h

…

abyss.c

…

abyss.h

…

ibmtr.c

…

Kconfig

…

lanstreamer.c

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

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

lanstreamer.h

…

madgemc.c

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

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

madgemc.h

…

Makefile

…

olympic.c

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

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

olympic.h

…

proteon.c

…

skisa.c

…

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.h

…

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