Merge branches 'video' and 'video-edid' into release
[sfrench/cifs-2.6.git] / drivers / gpu / vga /
drwxr-xr-x   ..
-rw-r--r-- 1028 Kconfig
-rw-r--r-- 84 Makefile
-rw-r--r-- 11452 vga_switcheroo.c
-rw-r--r-- 31820 vgaarb.c