Merge /spare/repo/linux-2.6/

author Jeff Garzik <jgarzik@pobox.com>

Thu, 22 Sep 2005 19:43:14 +0000 (15:43 -0400)

committer Jeff Garzik <jgarzik@pobox.com>

Thu, 22 Sep 2005 19:43:14 +0000 (15:43 -0400)
author Jeff Garzik <jgarzik@pobox.com>
Thu, 22 Sep 2005 19:43:14 +0000 (15:43 -0400)
committer Jeff Garzik <jgarzik@pobox.com>
Thu, 22 Sep 2005 19:43:14 +0000 (15:43 -0400)
diff --cc drivers/net/r8169.c
Simple merge
diff --cc drivers/net/skge.c
Simple merge
author	Jeff Garzik <jgarzik@pobox.com>
	Thu, 22 Sep 2005 19:43:14 +0000 (15:43 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Thu, 22 Sep 2005 19:43:14 +0000 (15:43 -0400)
		1	2
drivers/net/r8169.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/skge.c	patch \|	diff1 \|	diff2 \|	blob \| history