Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream

author Jeff Garzik <jeff@garzik.org>

Wed, 24 Oct 2007 00:15:54 +0000 (20:15 -0400)

committer Jeff Garzik <jeff@garzik.org>

Wed, 24 Oct 2007 00:15:54 +0000 (20:15 -0400)
author Jeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:15:54 +0000 (20:15 -0400)
committer Jeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:15:54 +0000 (20:15 -0400)
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/mv643xx_eth.c
Simple merge
author	Jeff Garzik <jeff@garzik.org>
	Wed, 24 Oct 2007 00:15:54 +0000 (20:15 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Wed, 24 Oct 2007 00:15:54 +0000 (20:15 -0400)
		1	2
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/mv643xx_eth.c	patch \|	diff1 \|	diff2 \|	blob \| history