Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[pandora-kernel.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/