Merge tag 'renesas-arm-defconfig-for-v4.20' of git://git.kernel.org/pub/scm/linux...

Renesas ARM Based SoC Defconfig Updates for v4.20

* shmobile and multi_v7 defconfigs:
  - Enable recently upstreamed r8a7744 SoC
  - Enable FDP1 (Fine Display processor) present on R-Car Gen2 and RZ/G1 SoCs
* shmobile defconfig (only):
  - Refresh for v4.19-rc1
  - Remove soon to be deprecated SOC_CAMERA

* tag 'renesas-arm-defconfig-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: defconfig: Enable r8a7744 SoC
  ARM: multi_v7_defconfig: Enable r8a7744 SoC
  ARM: multi_v7_defconfig: Enable VIDEO_RENESAS_FDP1
  ARM: shmobile: defconfig: Enable VIDEO_RENESAS_FDP1
  ARM: shmobile: defconfig: Refresh shmobile_defconfig for v4.19-rc1
  ARM: shmobile: defconfig: Remove SOC_CAMERA

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge