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/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -32,6 +32,7 @@
 #include <linux/nsproxy.h>
 #include <linux/pid.h>
 #include <linux/ipc_namespace.h>
+#include <linux/slab.h>

 #include <net/sock.h>
 #include "util.h"