Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/