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)
commitd4da404f36b24b089d20db1fb27d8f99cb66f409
tree349c4b792281826652eb9e6d7a46ed6622dc90de
parentfa4127c5eb8def998fd8a471d51a4f2560dea0a2
parent933519a5a269d8460450545adefcb5caec622cac
Merge airlied/drm-next into drm-misc-next

Backmerge 4.15 and hdcp topic branch

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