Merge by hand (conflicts in sr.c)
[linux-2.6] / drivers / video / intelfb /
drwxr-xr-x   ..
-rw-r--r-- 192 Makefile
-rw-r--r-- 5513 intelfb.h
-rw-r--r-- 42275 intelfbdrv.c
-rw-r--r-- 43759 intelfbhw.c
-rw-r--r-- 17278 intelfbhw.h