Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Tue, 29 Jul 2008 22:23:13 +0000 (18:23 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 29 Jul 2008 22:23:13 +0000 (18:23 -0400)

Trivial merge