Backmerge tag 'v4.7-rc2' into drm-next

Daniel has a pull request that relies on stuff in fixes that are in rc2.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/arm/hdlcd_drv.c
Simple merge

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