Merge branch 'fixes-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/