Merge commit 'v2.6.27-rc6' into timers/hpet
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/