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

This commit is contained in:
Linus Torvalds 2005-07-31 16:49:07 -07:00
commit be2ac68f7b
7 changed files with 807 additions and 459 deletions