diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /net/unix/garbage.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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> |