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

Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c

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

..

3c359_microcode.h

…

3c359.c

3c359: use netstats in net_device structure

2008-05-13 01:35:25 -04: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

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

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

abyss.h

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

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

ibmtr.c

[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

2007-10-10 16:51:42 -07:00

Kconfig

[TR]: Use menuconfig objects.

2007-05-24 16:36:52 -07:00

lanstreamer.c

[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

2007-10-10 16:51:42 -07:00

lanstreamer.h

…

madgemc.c

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

2008-02-03 16:36:24 +02: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

[NET]: Undo code bloat in hot paths due to print_mac().

2008-04-08 16:50:44 -07:00

olympic.h

drivers/net/tokenring/olympic.c: fix warning

2008-05-22 06:03:30 -04:00

proteon.c

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

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

skisa.c

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

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

smctr_firmware.h

…

smctr.c

smctr.c: fix logical-bitwise-or confusion

2008-03-25 23:15:32 -04:00

smctr.h

…

tms380tr.c

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

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

tms380tr.h

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

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

tmspci.c

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

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