From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 16 Oct 2009 09:16:02 +0000 (+0900)
Subject: Merge branch 'sh/stable-updates'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=78aed4a63aaa67f22cb1b541dd7528139a24c289;p=linux.git

Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig
---

78aed4a63aaa67f22cb1b541dd7528139a24c289
diff --cc arch/sh/Kconfig
index 5260fb55ab7f2,0dc7e3cbeffa4..266d422991e83
--- a/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