diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 16:37:29 -0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 16:37:29 -0400 |
| commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
| tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /net/unix/garbage.c | |
| parent | a36d515c7a2dfacebcf41729f6812dbc424ebcf0 (diff) | |
| parent | a9743fcdc0eb43d028b71267438076e1b0112ba0 (diff) | |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
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> |