Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 25 Oct 2016 08:06:04 +0000 (10:06 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 25 Oct 2016 08:06:04 +0000 (10:06 +0200)
Backmerge latest drm-next to have a baseline for the
s/fence/dma_fence/ patch from Chris.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1  2 
drivers/gpu/drm/i915/intel_dp.c

Simple merge