Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Mar 2007 18:38:09 +0000 (10:38 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Mar 2007 18:38:09 +0000 (10:38 -0800)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] DEC: Remove call to register_prom_console.


Trivial merge