Merge branch 'sh/ftrace' of git://github.com/mfleming/linux-2.6
[linux-2.6] / drivers / gpu / Makefile
1 obj-y                   += drm/