Merge remote-tracking branch 'imx-drm/imx-drm/next'

diff --cc drivers/gpu/drm/imx/imx-drm-core.c
Simple merge

diff --cc drivers/gpu/drm/imx/imx-ldb.c
Simple merge

diff --cc drivers/gpu/drm/imx/ipuv3-crtc.c
Simple merge

diff --cc include/video/imx-ipu-v3.h
Simple merge