Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 18:26:04 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 18:26:04 +0000 (11:26 -0700)

Trivial merge