Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig

diff --cc arch/sh/Kconfig
index 5260fb55ab7f2c6344c2614b8a8a35a892d2e631,0dc7e3cbeffa415c9cbd9a599a2ccccb74ee964b..266d422991e83757ed9c43385c8ec1acbc3a5c18
--- 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