Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
commitaf0900537f90b58fcfb7a7c821c661be8301fc9b
authorJeff Garzik <jeff@garzik.org>
Mon, 29 Oct 2007 09:48:33 +0000 (29 05:48 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 29 Oct 2007 09:48:33 +0000 (29 05:48 -0400)
tree21db97896616700099944c8591d5a4a99235fe16
parent3830de73000c07b2cbdf8cc31a46a01dda28c5df
parentd1417862d7355f0b395d83f2884afd614b086695
Merge branch 'upstream-jeff' of git://git./linux/kernel/git/romieu/netdev-2.6 into upstream-fixes