diff --git a/[refs] b/[refs]
index 3ab25401bef9..376d3e873257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc722f508a5bcbb65a7bb0c7ce8e3934f5763a1a
+refs/heads/master: 422d3c7a577b15e1384c9d4e72a9540896b685fa
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 5d733da5345a..058d949a3214 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -61,6 +61,7 @@ config TRACING_SUPPORT
 	bool
 	depends on TRACE_IRQFLAGS_SUPPORT
 	depends on STACKTRACE_SUPPORT
+	default y
 
 if TRACING_SUPPORT