Merge branch 'drm-tracepoints' into drm-testing
authorDave Airlie <airlied@redhat.com>
Wed, 7 Jul 2010 08:38:44 +0000 (18:38 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 7 Jul 2010 08:38:44 +0000 (18:38 +1000)

Trivial merge