Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/ stub/