Merge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs
[cascardo/linux.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/ stub/