diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 11:55:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 11:55:42 -0400 |
| commit | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 (patch) | |
| tree | d141e08ced08c40c6a8e3ab2cdecde5ff14e560f /net/core/skbuff.c | |
| parent | 8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e505b5392e1..c2e4fb8f354 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | 65 | ||
| 66 | #include <asm/uaccess.h> | 66 | #include <asm/uaccess.h> |
| 67 | #include <asm/system.h> | 67 | #include <asm/system.h> |
| 68 | #include <trace/skb.h> | 68 | #include <trace/events/skb.h> |
| 69 | 69 | ||
| 70 | #include "kmap_skb.h" | 70 | #include "kmap_skb.h" |
| 71 | 71 | ||