Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...
authorJeff Garzik <jeff@garzik.org>
Mon, 11 Feb 2008 16:07:34 +0000 (11:07 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 11 Feb 2008 16:07:34 +0000 (11:07 -0500)

Trivial merge