Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 14 Sep 2005 16:35:34 +0000 (09:35 -0700)]

Trivial merge