Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

This commit is contained in:
Linus Torvalds 2005-12-01 15:49:37 -08:00
commit f327220b14
15 changed files with 108 additions and 1092 deletions