Merge branch 'linus' into timers/core

Reason: Further posix_cpu_timer patches depend on mainline changes Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2010-05-10 11:59:37 +02:00
parent 6a867a3955 b57f95a382
commit dbb6be6d5e
5707 changed files with 100984 additions and 21049 deletions
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -35,7 +35,6 @@
 #include <linux/syscalls.h>
 #include <linux/security.h>
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include <linux/math64.h>
 #include <linux/ptrace.h>