Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig

diff --cc arch/sh/Kconfig
index 5260fb5,0dc7e3c..266d422
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -37,8 -37,6 +37,7 @@@ config SUPERH3
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       select HAVE_FTRACE_SYSCALLS
 +      select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_ARCH_KGDB
        select ARCH_HIBERNATION_POSSIBLE if MMU