merge by hand (fix up qla_os.c merge error)
[powerpc.git] / drivers / video / gbefb.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2