Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
commit02bae2129710018883f9536969de7e6acf9304ca
authorJeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:15:54 +0000 (23 20:15 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:15:54 +0000 (23 20:15 -0400)
treec2f3b120b4c48288e2735fa7136895da3ff8615a
parentc7ffb6bb7a1b6fe5912a009d561733911769d32b
parentc1f395f1c76b115c9691e1546942651fedb08c37
Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
drivers/net/Kconfig
drivers/net/mv643xx_eth.c