Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / video / intelfb /
drwxr-xr-x   ..
-rw-r--r-- 192 Makefile
-rw-r--r-- 5652 intelfb.h
-rw-r--r-- 41824 intelfbdrv.c
-rw-r--r-- 43741 intelfbhw.c
-rw-r--r-- 17278 intelfbhw.h