Merge remote branch 'airlied/drm-next' into drm-intel-next

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc include/drm/drm_crtc.h
Simple merge