diff --git a/[refs] b/[refs]
index a8b75914283e..38d0a305cdba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: debfcaf93ed500a051489db6646d71f29fe86a68
+refs/heads/master: 17d80fd07d35ae1d231b3378ee4f00ace54f9d31
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 3533c583df47..bc535cb91de9 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -29,6 +29,8 @@ config TRACING
 	select STACKTRACE
 	select TRACEPOINTS
 
+menu "Tracers"
+
 config FUNCTION_TRACER
 	bool "Kernel Function Tracer"
 	depends on HAVE_FUNCTION_TRACER
@@ -191,3 +193,5 @@ config FTRACE_STARTUP_TEST
 	  a series of tests are made to verify that the tracer is
 	  functioning properly. It will do tests on all the configured
 	  tracers of ftrace.
+
+endmenu