From: Olof Johansson Date: Wed, 14 Aug 2013 07:46:07 +0000 (-0700) Subject: Merge tag 'renesas-multiplatform-for-v3.12' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: firefly_0821_release~176^2~5404^2~12 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e91f24ae027a583f2faff84456fa2630144bfed8;p=firefly-linux-kernel-4.4.55.git Merge tag 'renesas-multiplatform-for-v3.12' of git://git./linux/kernel/git/horms/renesas into next/dt From Simon Horman: Renesas ARM based SoC multiplatform updates for v3.12 Move Renesas ARM based SoCs a little closer to using multiplatform by adding ARCH_SHMOBILE_MULTI and only building clocks when COMMON_CLK=n. * tag 'renesas-multiplatform-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Allow ARCH_SHMOBILE_MULTI timer configuration ARM: shmobile: Add EMEV2 and KZM9D to ARCH_SHMOBILE_MULTI ARM: shmobile: Introduce ARCH_SHMOBILE_MULTI ARM: shmobile: Only build clocks when COMMON_CLK=n Signed-off-by: Olof Johansson --- e91f24ae027a583f2faff84456fa2630144bfed8