Merge branch 'linus' into timers/core

Reason: Get upstream fixes before adding conflicting code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2013-04-24 20:33:46 +02:00
1262 changed files with 13884 additions and 7820 deletions
-4
View File
@@ -28,10 +28,6 @@ config BUILDTIME_EXTABLE_SORT
menu "General setup"
config EXPERIMENTAL
bool
default y
config BROKEN
bool