Merge branches 'sh/serial-rework' and 'sh/oprofile'
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/