Merge branch 'master' into upstream
[pandora-kernel.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/ stub/