Merge /spare/repo/linux-2.6/

author Jeff Garzik <jgarzik@pretzel.yyz.us>

Thu, 23 Jun 2005 01:50:57 +0000 (21:50 -0400)

committer Jeff Garzik <jgarzik@pobox.com>

Thu, 23 Jun 2005 01:50:57 +0000 (21:50 -0400)
author Jeff Garzik <jgarzik@pretzel.yyz.us>
Thu, 23 Jun 2005 01:50:57 +0000 (21:50 -0400)
committer Jeff Garzik <jgarzik@pobox.com>
Thu, 23 Jun 2005 01:50:57 +0000 (21:50 -0400)
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge
author	Jeff Garzik <jgarzik@pretzel.yyz.us>
	Thu, 23 Jun 2005 01:50:57 +0000 (21:50 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Thu, 23 Jun 2005 01:50:57 +0000 (21:50 -0400)
		1	2
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history