Merge remote branch 'origin/modesetting-101' into modesetting-gem

diff --cc linux-core/drm_crtc_helper.c
Simple merge

diff --cc linux-core/drm_drv.c
Simple merge

diff --cc linux-core/intel_crt.c
Simple merge

diff --cc linux-core/intel_tv.c
Simple merge

diff --cc shared-core/drm.h
Simple merge