Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next

The patchset contains a new helper in drm_fb_cma_helper.c for suspend/
resume when using cma backed framebuffers.

* 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu:
  drm/fsl-dcu: disable vblank events on CRTC disable
  drm/fsl-dcu: implement suspend/resume using atomic helpers
  drm/fsl-dcu: use clk helpers
  drm/fsl-dcu: move layer initialization to plane file
  drm/fsl-dcu: store layer registers in soc_data
  drm/fb_cma_helper: add suspend helper

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

diff --cc drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
Simple merge