Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/mach-shmobile/board-bockw.c
	arch/arm/mach-shmobile/clock-r8a7778.c
	arch/arm/mach-shmobile/include/mach/r8a7778.h

diff --cc arch/arm/mach-shmobile/Kconfig
index 3912ce91fee42574346c85635ef9089076bceec0,e46bc94c0634bddc23f048fa4eb1f073141008bb..cf53109d484972b64acfa58267ac057de73471bc
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -23,9 -23,11 +23,11 @@@ config ARCH_R8A73A
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
        select CPU_V7
 -      select ARM_ARCH_TIMER
 +      select HAVE_ARM_ARCH_TIMER
        select SH_CLK_CPG
        select RENESAS_IRQC
+       select ARCH_HAS_CPUFREQ
+       select ARCH_HAS_OPP
  
  config ARCH_R8A7740
        bool "R-Mobile A1 (R8A77400)"

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