Merge commit 'v2.6.32' into reiserfs/kill-bkl
[pandora-kernel.git] / drivers / gpu / Makefile
1 obj-y                   += drm/ vga/