Merge commit 'v2.6.28-rc7' into tracing/core
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/