Merge branches 'core/signal' and 'x86/spinlocks' into x86/xen
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/