Merge Linus' tree.
[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / video / console / promcon.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2