Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Feb 2006 15:41:30 +0000 (07:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Feb 2006 15:41:30 +0000 (07:41 -0800)

Trivial merge