Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/