Merge branch 'bug-fixes' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into...
authorJeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:15:05 +0000 (20:15 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:15:05 +0000 (20:15 -0400)

Trivial merge