Merge tag 'renesas-soc-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:02:48 +0000 (22:02 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 19 Nov 2014 21:02:48 +0000 (22:02 +0100)
commitc39bacad19b0e4762508cb974a34f0ded67145e4
treeb5f90b2ef604ef58126547830ee1934f989f0c39
parent15fee17dbad630e38a6ce441e368ed758cb34b35
parent3794705aeb318c431c07072f04380c78cc5a84ac
Merge tag 'renesas-soc-for-v3.19' of git://git./linux/kernel/git/horms/renesas into next/soc

Pull "Renesas ARM Based SoC Soc Updates for v3.19" from Simon Horman:

* Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled
* Add CA7 arch_timer initialization for r8a7794
* Handle CA7 arch timer delay
* Add shmobile_init_late() to sh7372
  - This is consistent with other shmobile SoCs

* tag 'renesas-soc-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled
  ARM: shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794
  ARM: shmobile: sh7372: Add shmobile_init_late()
  ARM: shmobile: Handle CA7 arch timer delay

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