Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commitef8d2f45c6dde22cef2eb38cb0e05edcd171a034
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 01:27:11 +0000 (28 17:27 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 29 Nov 2006 01:27:11 +0000 (28 17:27 -0800)
tree99fb6fce60f224d98b0296e1557b35f3b95187da
parent4195bdbea42151c04485b0d131eed6dd97309cee
parent177b2927e2eea73c598a218680b4dc9043c51dcb
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix Bonito bootup message.