Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@evo.osdl.org>
Fri, 2 Sep 2005 07:46:53 +0000 (00:46 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Fri, 2 Sep 2005 07:46:53 +0000 (00:46 -0700)

Trivial merge