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