Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next
authorJeff Garzik <jeff@garzik.org>
Thu, 25 Sep 2008 00:40:52 +0000 (20:40 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 25 Sep 2008 00:40:52 +0000 (20:40 -0400)
1  2 
drivers/net/Kconfig

Simple merge