Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] DEC: Remove call to register_prom_console.
This commit is contained in:
Linus Torvalds 2007-03-09 10:38:09 -08:00
commit 30fbc9f77c