Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorJeff Garzik <jeff@garzik.org>
Tue, 29 Apr 2008 05:54:31 +0000 (01:54 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 29 Apr 2008 05:54:31 +0000 (01:54 -0400)
commitdd32f7effdd2f3f348ef91ca1649d78a0ab2b103
tree059911292a94d78ba08e553d70035d89a4e7fdf5
parent090bf62199d6079cc47c0b78ced9508391b24fa1
parent21e197f231343201368338603cb0909a13961bac
Merge branch 'upstream-jeff' of git://git./linux/kernel/git/romieu/netdev-2.6 into upstream