]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge tag 'renesas-soc2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 14 Aug 2013 08:09:40 +0000 (01:09 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 14 Aug 2013 18:09:47 +0000 (11:09 -0700)
commitf2d6e550a23e6ea5aca70817ada87b78f2b8c6c1
tree3b01d8edc1c2da5e20cb1a57dddf30504b5c3b7c
parentfc5d46222fe60ce56da47bcb85beed3f8864a5fe
parentd687f4d1993fa046171dbb1ca1970a3172ce11b9
Merge tag 'renesas-soc2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Second Round of Renesas ARM based SoC updates for v3.12

* Increased clock coverage for r8a7740 and r8a7790 SoCs

* tag 'renesas-soc2-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7740: Add TPU clock entry for DT platforms
  ARM: shmobile: r8a7790: clocks for Ether support
  ARM: shmobile: r8a7740: Fix TPU clock name
  ARM: shmobile: Insert align directives before 4 bytes data
  ARM: shmobile: Force ARM mode to compile reset vector for secondary CPUs
  ARM: shmobile: fix compile error when CONFIG_THUMB2_KERNEL=y
  ARM: shmobile: Update romImage to relocate appended DTB

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-shmobile/headsmp-scu.S
arch/arm/mach-shmobile/headsmp.S