From f85754414df4c22b85b3b5c1259241c9a270428f Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Fri, 26 Feb 2010 15:01:23 +0100
Subject: [PATCH] --- yaml --- r: 182271 b: refs/heads/master c:
 b309a294e5b24692d0f7ea1defa168074cea619e h: refs/heads/master i:   182269:
 589e7242321e6465cab05a185e87f653152939ed   182267:
 18a3c09bcb9dccd814e51c3db424c636b256af1c   182263:
 f6d4b002ac82f35f9344c9dbc70d26bdb29d972a   182255:
 3ef8b90b3647e0cbacd18840951c96dd67bcc007   182239:
 d7b7cd3976c5236aac4f23dde287e37879bf8a5c   182207:
 410141c50ec5e442e01fe28a2d8e4cabd66fd338   182143:
 445932772394e8bed69f4e733f6ad7bde85e1632   182015:
 2aa464760926d4bbfd8eb18502cd4f81605cc06f   181759:
 f6c24e1200baef6b7603ceba408cb9ac08e5c543   181247:
 ea02f4fd95a6a74886335a82fdc6acd59758ccf7   180223:
 d6ecfc0a2658379b0710cf00f231f5a199e10333 v: v3

---
 [refs]             | 2 +-
 trunk/arch/Kconfig | 2 +-
 trunk/init/Kconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 190fd2a90722..d5ff270f1378 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18b4a4d59e97e7ff13ee84b5bec79f3fc70a9f0a
+refs/heads/master: b309a294e5b24692d0f7ea1defa168074cea619e
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
index 25e69f727a2e..d67787241813 100644
--- a/trunk/arch/Kconfig
+++ b/trunk/arch/Kconfig
@@ -3,7 +3,7 @@
 #
 
 config OPROFILE
-	tristate "OProfile system profiling (EXPERIMENTAL)"
+	tristate "OProfile system profiling"
 	depends on PROFILING
 	depends on HAVE_OPROFILE
 	select RING_BUFFER
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index d95ca7cd5d45..b7c583956107 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -1112,7 +1112,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.