From: Arnd Bergmann Date: Fri, 5 Sep 2014 15:29:29 +0000 (+0200) Subject: Merge tag 'renesas-soc2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59255f4de51e325571d23c8f6f5046069630619f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'renesas-soc2-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc Merge "Second Round Of Renesas ARM Based SoC Updates For v3.18" from Simon Horman: * Move legacy INTC definitions from irqs.h to intc.h * Remove duplicate CPUFreq bits on r8a73a0/ape6evm Signed-off-by: Arnd Bergmann * tag 'renesas-soc2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits --- 59255f4de51e325571d23c8f6f5046069630619f