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 /net/sctp/ulpqueue.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 'net/sctp/ulpqueue.c')
| -rw-r--r-- | net/sctp/ulpqueue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index 7b23803343cc..3a448536f0b6 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | * be incorporated into the next SCTP release. | 41 | * be incorporated into the next SCTP release. |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <linux/slab.h> | ||
| 44 | #include <linux/types.h> | 45 | #include <linux/types.h> |
| 45 | #include <linux/skbuff.h> | 46 | #include <linux/skbuff.h> |
| 46 | #include <net/sock.h> | 47 | #include <net/sock.h> |