Merge commit 'linus/master' into tracing/kprobes
[pandora-kernel.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/