Merge branch 'linus' into timers/core

Reason: Get upstream fixes before adding conflicting code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2013-04-24 20:33:46 +02:00
commit 6402c7dc2a
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -28,10 +28,6 @@ config BUILDTIME_EXTABLE_SORT

 menu "General setup"

-config EXPERIMENTAL
-	bool
-	default y
-
 config BROKEN
 	bool