Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/ stub/