Merge tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Sep 2014 15:09:35 +0000 (17:09 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Sep 2014 15:09:35 +0000 (17:09 +0200)
commit138310e18b70caed1b7acf02a2c97170dcb3c55d
treec33e62cd472775401877f2c2ca8c071f0ac31581
parenteb492df9616156416e160bb59f7fd0437d6f5424
parent5923abb205e05773e0bb16c7ca4c0b41dbeec40e
Merge tag 'renesas-soc3-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc

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()
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/timer.c