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

Conflicts:
	drivers/media/i2c/Kconfig
	drivers/media/media-entity.c
	drivers/media/platform/vimc/vimc-capture.c
	include/media/media-entity.h