Merge branch 'x86/apic' into x86/core
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/