diff --git a/[refs] b/[refs]
index bf80e7f47edb..0565f282668b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d1b6949d2c855f195de0f5146625015ecca3944
+refs/heads/master: 470a1396c25c27b4aff08b14d5c9cd9b3da15e09
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index cb2c09270226..823ee0a2d2a3 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -961,9 +961,17 @@ config PERF_COUNTERS
 	  Say Y if unsure.
 
 config EVENT_PROFILE
-	bool "Tracepoint profile sources"
+	bool "Tracepoint profiling sources"
 	depends on PERF_COUNTERS && EVENT_TRACING
 	default y
+	help
+	 Allow the use of tracepoints as software performance counters.
+
+	 When this is enabled, you can create perf counters based on
+	 tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID
+	 found in debugfs://tracing/events/*/*/id. (The -e/--events
+	 option to the perf tool can parse and interpret symbolic
+	 tracepoints, in the subsystem:tracepoint_name format.)
 
 endmenu