Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 31 Jul 2005 23:48:39 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 31 Jul 2005 23:48:39 +0000 (16:48 -0700)

Trivial merge