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)
commit30fbc9f77c5a77f5f7f053d29eb92e41f6043406
tree4f50cab4a3f37133dc5c1c35ee0d10934276a23d
parent6e96783f586cc0a64651087cb518209a8577123f
parent8960909ca71da6120cad2fd7ece7dbe32ae05b40
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] DEC: Remove call to register_prom_console.