Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 30 Oct 2005 22:47:58 +0000 (14:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 30 Oct 2005 22:47:58 +0000 (14:47 -0800)

Trivial merge