Merge remote branch 'tip/oprofile' into tip/perf/core

[net-next-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index ada48441aff88725cb09bf5b71eaa004538911c9..cf2dc3cd4f04f573a7d2f7b8bfc145c3fd258cb7 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1099,7 +1099,7 @@ config MMAP_ALLOW_UNINITIALIZED
          See Documentation/nommu-mmap.txt for more information.
 
 config PROFILING
-       bool "Profiling support (EXPERIMENTAL)"
+       bool "Profiling support"
        help
          Say Y here to enable the extended profiling support mechanisms used
          by profilers such as OProfile.