Merge tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull "Third Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman:

* Initial r8a7794 SoC support
* Support Cortex-A7 in shmobile_init_delay()

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Initial r8a7794 SoC support
  ARM: shmobile: support Cortex-A7 in shmobile_init_delay()

diff --cc arch/arm/mach-shmobile/Kconfig
index 04d9cee4b6b4b5f76b4122a65473f4cc0cd7762e,05f4cc07dffb07f3d427f3d46460b88eece15236..b70d945121f99e39fc33b1fb555792f52b5ad0c6
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -46,8 -41,16 +46,12 @@@ config ARCH_R8A779
        select RENESAS_IRQC
        select SYS_SUPPORTS_SH_CMT
  
+ config ARCH_R8A7794
+       bool "R-Car E2 (R8A77940)"
+       select ARCH_RCAR_GEN2
+ 
  comment "Renesas ARM SoCs Board Type"
  
 -config MACH_GENMAI
 -      bool "Genmai board"
 -      depends on ARCH_R7S72100
 -
  config MACH_KOELSCH
        bool "Koelsch board"
        depends on ARCH_R8A7791

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

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