Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Tue, 13 Dec 2005 16:53:56 +0000 (08:53 -0800)]

Trivial merge