From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 1 Feb 2017 09:58:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
X-Git-Tag: v4.12-rc1~116^2~34^2~373
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e2b06d71bd3f50ac7098b3f2492ea95470b713db;p=linux.git

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Chris Wilson wants the new fence tracepoint added in

commit 8c96c678011eeb1676da18f203e90dea7e0d69d2
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Jan 24 11:57:58 2017 +0000

    dma/fence: Export enable-signaling tracepoint for emission by drivers

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

e2b06d71bd3f50ac7098b3f2492ea95470b713db