Merge bk://gkernel.bkbits.net/net-drivers-2.5

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

Thu, 5 Feb 2004 05:07:47 +0000 (21:07 -0800)

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

Thu, 5 Feb 2004 05:07:47 +0000 (21:07 -0800)
author Linus Torvalds <torvalds@home.osdl.org>
Thu, 5 Feb 2004 05:07:47 +0000 (21:07 -0800)
committer Linus Torvalds <torvalds@home.osdl.org>
Thu, 5 Feb 2004 05:07:47 +0000 (21:07 -0800)
diff --cc include/linux/pci_ids.h
Simple merge
diff --cc net/core/dev.c
Simple merge
author	Linus Torvalds <torvalds@home.osdl.org>
	Thu, 5 Feb 2004 05:07:47 +0000 (21:07 -0800)
committer	Linus Torvalds <torvalds@home.osdl.org>
	Thu, 5 Feb 2004 05:07:47 +0000 (21:07 -0800)
		1	2
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	patch \|	diff1 \|	diff2 \|	blob \| history