Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 16 Sep 2005 17:31:31 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 16 Sep 2005 17:31:31 +0000 (10:31 -0700)

Trivial merge