Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 18 Aug 2005 21:58:21 +0000 (14:58 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 18 Aug 2005 21:58:21 +0000 (14:58 -0700)

Trivial merge