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)
commit102e73463e1bb921b3a829a1392a29dba16bbabd
tree8c569c1a6a7fd3ffc21cf1780bd8fa62be5b23b2
parent5c8d7171cc4984351af802a525675d50ae555a7b
parente5510fac98a706c424034950f55bb5e819c46f51
Merge branch 'drm-tracepoints' into drm-testing
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_irq.c
include/drm/drmP.h