Merge airlied/drm-next into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)
committerSean Paul <seanpaul@chromium.org>
Fri, 16 Feb 2018 20:47:43 +0000 (15:47 -0500)
Backmerge 4.15 and hdcp topic branch

Signed-off-by: Sean Paul <seanpaul@chromium.org>
1  2 
drivers/gpu/drm/sun4i/sun4i_tcon.c
include/drm/drm_dp_helper.h

Simple merge
Simple merge