Merge branch 'linus' into core/generic-dma-coherent
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/