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