Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Wed, 27 Aug 2008 09:10:25 +0000 (05:10 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 27 Aug 2008 09:10:25 +0000 (05:10 -0400)

Trivial merge