Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[linux-2.6-block.git] / drivers / gpu / Makefile
CommitLineData
deb2d2ec 1obj-y += drm/ vga/