Merge tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "Third Round of Renesas ARM Based SoC Fixes for v3.19" from Simon Horman:

* Instantiate GIC from C board code in legacy builds on r8a7790 and r8a73a4

* tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds
  ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-shmobile/board-ape6evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-rcar-gen2.c
Simple merge

diff --cc arch/arm/mach-shmobile/timer.c
Simple merge