Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 Aug 2005 05:05:21 +0000 (22:05 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 Aug 2005 05:05:21 +0000 (22:05 -0700)

Trivial merge