Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 Aug 2005 01:05:14 +0000 (18:05 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 Aug 2005 01:05:14 +0000 (18:05 -0700)

Trivial merge