Merge commit 'jwb/jwb-merge' into merge
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/