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)
commit0fc4f78f44e6c6148cee32456f0d0023ec1c1fd8
tree71c906207227dd8753a0191db9304035ec3471a4
parent78010cd9736ec571796f4404524ed575b81238b9
parent5481e27f6fd06b7cb902072e81d6b083db8155eb
Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc

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>
drivers/gpu/drm/i915/intel_dp.c