Merge branch 'du/for-renesas-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar into renesas-drivers

Conflicts:
	drivers/gpu/drm/rcar-du/rcar_du_crtc.c
	drivers/gpu/drm/rcar-du/rcar_du_crtc.h
	drivers/gpu/drm/rcar-du/rcar_du_encoder.c