Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/