diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 05:59:37 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 08:20:42 -0400 |
| commit | dbb6be6d5e974c42bbecd183effaa0df69e1dd8b (patch) | |
| tree | 5735cb47e70853d057a9881dd0ce44b83e88fa63 /ipc/mqueue.c | |
| parent | 6a867a395558a7f882d041783e4cdea6744ca2bf (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index a9d8b0ced4e9..d6c09c46ad06 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/nsproxy.h> | 32 | #include <linux/nsproxy.h> |
| 33 | #include <linux/pid.h> | 33 | #include <linux/pid.h> |
| 34 | #include <linux/ipc_namespace.h> | 34 | #include <linux/ipc_namespace.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <net/sock.h> | 37 | #include <net/sock.h> |
| 37 | #include "util.h" | 38 | #include "util.h" |