Merge bk://kernel.bkbits.net/davem/tg3-2.5

author Linus Torvalds <torvalds@home.osdl.org>

Mon, 1 Sep 2003 02:46:16 +0000 (19:46 -0700)

committer Linus Torvalds <torvalds@home.osdl.org>

Mon, 1 Sep 2003 02:46:16 +0000 (19:46 -0700)
author Linus Torvalds <torvalds@home.osdl.org>
Mon, 1 Sep 2003 02:46:16 +0000 (19:46 -0700)
committer Linus Torvalds <torvalds@home.osdl.org>
Mon, 1 Sep 2003 02:46:16 +0000 (19:46 -0700)
diff --cc drivers/net/tg3.c
Simple merge
diff --cc net/core/ethtool.c
Simple merge
author	Linus Torvalds <torvalds@home.osdl.org>
	Mon, 1 Sep 2003 02:46:16 +0000 (19:46 -0700)
committer	Linus Torvalds <torvalds@home.osdl.org>
	Mon, 1 Sep 2003 02:46:16 +0000 (19:46 -0700)
		1	2
drivers/net/tg3.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/ethtool.c	patch \|	diff1 \|	diff2 \|	blob \| history