Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 13 Oct 2005 02:07:38 +0000 (19:07 -0700)]

Trivial merge