Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / arch / i386 / video / 
tree63d2ac2e846dc5cb45f27271862dff7c0ca3f88d
drwxr-xr-x   ..
-rw-r--r-- 42 Makefile
-rw-r--r-- 731 fbdev.c