Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream

This commit is contained in:
Jeff Garzik 2007-10-23 20:13:24 -04:00
commit 43cd73658d