Merge tag 'renesas-soc2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

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 <arnd@arndb.de>
* 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

diff --cc arch/arm/mach-shmobile/board-ape6evm-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-kzm9g.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
Simple merge