summaryrefslogtreecommitdiffstats
path: root/include/trace/define_trace.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-07-26 17:26:29 +1000
committerDave Airlie <airlied@redhat.com>2016-07-26 17:26:29 +1000
commit5e580523d9128a4d8364fe89d36c38fc7819c8dd (patch)
tree852fb2427d980830ae8686a91e4ca5873f259ab9 /include/trace/define_trace.h
parentc11dea5b0290984fa48111957ba3fdc5b3bdae5a (diff)
parent523d939ef98fd712632d93a5a2b588e477a7565e (diff)
downloadblackbird-op-linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.tar.gz
blackbird-op-linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.zip
Backmerge tag 'v4.7' into drm-next
Linux 4.7 As requested by Daniel Vetter as the conflicts were getting messy.
Diffstat (limited to 'include/trace/define_trace.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud