diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 17:59:58 -0400 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /net/unix/garbage.c | |
| parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'net/unix/garbage.c')
| -rw-r--r-- | net/unix/garbage.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 19c17e4a0c8b..14c22c3768da 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | #include <linux/un.h> | 74 | #include <linux/un.h> |
| 75 | #include <linux/net.h> | 75 | #include <linux/net.h> |
| 76 | #include <linux/fs.h> | 76 | #include <linux/fs.h> |
| 77 | #include <linux/slab.h> | ||
| 78 | #include <linux/skbuff.h> | 77 | #include <linux/skbuff.h> |
| 79 | #include <linux/netdevice.h> | 78 | #include <linux/netdevice.h> |
| 80 | #include <linux/file.h> | 79 | #include <linux/file.h> |