Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 17:58:27 +0000 (09:58 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 17:58:27 +0000 (09:58 -0800)

Trivial merge