Merge branch 'sh/rsk-updates' into sh-latest

Conflicts:
	arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/sh/Kconfig
index 98405fa24e8189063cbb59c0e6e1a71dabeec39d,44a22dd861344b2b0976b31f1bc9e412b50126ef..65bdb5da79c5a690949e3337a56bf547cc533b87
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -594,7 -591,8 +601,8 @@@ config SH_CLK_CP
  config SH_CLK_CPG_LEGACY
        depends on SH_CLK_CPG
        def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
-                     !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && !CPU_SUBTYPE_SH7734
+                     !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \
 -                    !CPU_SUBTYPE_SH7264
++                    !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264
  
  source "kernel/time/Kconfig"
  

diff --cc arch/sh/boards/Kconfig
Simple merge

diff --cc arch/sh/include/asm/processor.h
Simple merge

diff --cc arch/sh/kernel/cpu/proc.c
Simple merge