Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:52:58 +0000 (15:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:52:58 +0000 (15:52 -0800)

Trivial merge