Merge branch 'upstream-fixes' into upstream

author Jeff Garzik <jeff@garzik.org>

Sat, 19 Aug 2006 21:45:11 +0000 (17:45 -0400)

committer Jeff Garzik <jeff@garzik.org>

Sat, 19 Aug 2006 21:45:11 +0000 (17:45 -0400)
author Jeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:45:11 +0000 (17:45 -0400)
committer Jeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:45:11 +0000 (17:45 -0400)
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge
diff --cc drivers/net/smc911x.c
Simple merge
diff --cc drivers/net/sundance.c
Simple merge
author	Jeff Garzik <jeff@garzik.org>
	Sat, 19 Aug 2006 21:45:11 +0000 (17:45 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Sat, 19 Aug 2006 21:45:11 +0000 (17:45 -0400)
		1	2
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/smc911x.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/sundance.c	patch \|	diff1 \|	diff2 \|	blob \| history