Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 18:56:34 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 18:56:34 +0000 (10:56 -0800)

Trivial merge