summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/drm_trace.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-05-09 13:49:56 +1000
committerDave Airlie <airlied@redhat.com>2016-05-09 13:49:56 +1000
commitbafb86f5bc3173479002555dea7f31d943b12332 (patch)
tree6ec94c96460faf782cdb8781339560e13e0918b0 /drivers/gpu/drm/drm_trace.h
parentba391646d0d43aee3596b616113cce0f22dde627 (diff)
parent44549e8f5eea4e0a41b487b63e616cb089922b99 (diff)
downloadlwn-bafb86f5bc3173479002555dea7f31d943b12332.tar.gz
lwn-bafb86f5bc3173479002555dea7f31d943b12332.zip
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have some newer trees to pull in.
Diffstat (limited to 'drivers/gpu/drm/drm_trace.h')
0 files changed, 0 insertions, 0 deletions