diff --git a/[refs] b/[refs]
index 2a183d4f62c3..920dab746491 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e51f33fcc7f55e6df25d15b55ed10c8b4da84cd
+refs/heads/master: aac6abca858386438d9a7233c3471d2ecfa2f704
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index fa42e6b549d3..4c33316743f5 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -324,7 +324,8 @@ config HAVE_UNSTABLE_SCHED_CLOCK
 
 config GROUP_SCHED
 	bool "Group CPU scheduler"
-	default y
+	depends on EXPERIMENTAL
+	default n
 	help
 	  This feature lets CPU scheduler recognize task groups and control CPU
 	  bandwidth allocation to such task groups.
@@ -332,7 +333,7 @@ config GROUP_SCHED
 config FAIR_GROUP_SCHED
 	bool "Group scheduling for SCHED_OTHER"
 	depends on GROUP_SCHED
-	default y
+	default GROUP_SCHED
 
 config RT_GROUP_SCHED
 	bool "Group scheduling for SCHED_RR/FIFO"