Merge branch 'linus'
[linux-2.6] / arch / mips / dec / prom / console.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2