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