Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorJeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:13:24 +0000 (20:13 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 Oct 2007 00:13:24 +0000 (20:13 -0400)
commit43cd73658d8077ee6899b0b5029aad0cba1e9f92
tree86204ed58e56e16d8bbb0a9ce578122f6ee553ea
parent01e7ae8c13bb06a2ce622ebace33bb7e28ef596c
parent7da97ec96a0934319c7fbedd3d38baf533e20640
Merge branch 'upstream-jeff' of git://git./linux/kernel/git/romieu/netdev-2.6 into upstream