Merge airlied/drm-next into drm-misc-next

author Sean Paul <[email protected]>

Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)

committer Sean Paul <[email protected]>

Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)
author Sean Paul <[email protected]>
Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)
committer Sean Paul <[email protected]>
Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)
diff --cc drivers/gpu/drm/sun4i/sun4i_tcon.c
Simple merge
diff --cc include/drm/drm_dp_helper.h
Simple merge
author	Sean Paul <[email protected]>
	Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)
committer	Sean Paul <[email protected]>
	Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)
		1	2
drivers/gpu/drm/sun4i/sun4i_tcon.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/drm/drm_dp_helper.h	patch \|	diff1 \|	diff2 \|	blob \| history