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

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

Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)

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

Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)
author Linus Torvalds <torvalds@ppc970.osdl.org>
Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)
committer Linus Torvalds <torvalds@ppc970.osdl.org>
Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)
diff --cc drivers/net/8139too.c
Simple merge
diff --cc drivers/net/wireless/airo.c
Simple merge
author	Linus Torvalds <torvalds@ppc970.osdl.org>
	Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)
committer	Linus Torvalds <torvalds@ppc970.osdl.org>
	Mon, 19 Apr 2004 05:19:26 +0000 (22:19 -0700)
		1	2
drivers/net/8139too.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/airo.c	patch \|	diff1 \|	diff2 \|	blob \| history