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

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

2008-04-14 02:30:23 -07:00

..

3c359_microcode.h

…

3c359.c

drivers/net/tokenring/3c359.c: use time_* macros

2008-03-28 22:14:20 -04:00

3c359.h

3c359 endianness annotations and fixes

2007-12-22 23:16:42 -05: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

[PATCH] drivers/net/tokenring/lanstreamer.h Removal of old code

2006-09-25 20:01:19 -04:00

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

endianness annotations and fixes for olympic

2008-01-28 15:07:08 -08: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

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

smctr.c

smctr.c: fix logical-bitwise-or confusion

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

smctr.h

[PATCH] smctr warning fix

2006-02-17 16:16:21 -05:00

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