From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 9 Mar 2007 18:38:09 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.21-rc4~68
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30fbc9f77c5a77f5f7f053d29eb92e41f6043406;p=linux-2.6

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.
---

30fbc9f77c5a77f5f7f053d29eb92e41f6043406