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/tipc/socket.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/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 4b235fc1c70f..cfb20b80b3a1 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | #include <linux/socket.h> | 40 | #include <linux/socket.h> |
| 41 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 42 | #include <linux/mm.h> | 42 | #include <linux/mm.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/poll.h> | 43 | #include <linux/poll.h> |
| 45 | #include <linux/fcntl.h> | 44 | #include <linux/fcntl.h> |
| 45 | #include <linux/gfp.h> | ||
| 46 | #include <asm/string.h> | 46 | #include <asm/string.h> |
| 47 | #include <asm/atomic.h> | 47 | #include <asm/atomic.h> |
| 48 | #include <net/sock.h> | 48 | #include <net/sock.h> |