Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / arch / x86 / video /
drwxr-xr-x   ..
-rw-r--r-- 42 Makefile
-rw-r--r-- 705 fbdev.c