Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git] / arch / sparc / prom / console.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2