Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Feb 2006 18:04:04 +0000 (10:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 7 Feb 2006 18:04:04 +0000 (10:04 -0800)

Trivial merge