Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/