Merge by hand (conflicts in sr.c)
[powerpc.git] / drivers / video / intelfb / intelfbhw.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2