diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /net/sched/em_meta.c | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/sched/em_meta.c')
| -rw-r--r-- | net/sched/em_meta.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 24dce8b648a4..3bcac8aa333c 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | * only available if that subsystem is enabled in the kernel. | 58 | * only available if that subsystem is enabled in the kernel. |
| 59 | */ | 59 | */ |
| 60 | 60 | ||
| 61 | #include <linux/slab.h> | ||
| 61 | #include <linux/module.h> | 62 | #include <linux/module.h> |
| 62 | #include <linux/types.h> | 63 | #include <linux/types.h> |
| 63 | #include <linux/kernel.h> | 64 | #include <linux/kernel.h> |