Merge commit 'v2.6.34-rc1' into perf/urgent
[sfrench/cifs-2.6.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/