diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 (patch) | |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d /fs/dlm/plock.c | |
| parent | 22265a5c3c103cf8c50be62e6c90d045eb649e6d (diff) | |
| parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'fs/dlm/plock.c')
| -rw-r--r-- | fs/dlm/plock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index b5f89aef3b29..d45c02db6943 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/poll.h> | 11 | #include <linux/poll.h> |
| 12 | #include <linux/dlm.h> | 12 | #include <linux/dlm.h> |
| 13 | #include <linux/dlm_plock.h> | 13 | #include <linux/dlm_plock.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | #include "dlm_internal.h" | 16 | #include "dlm_internal.h" |
| 16 | #include "lockspace.h" | 17 | #include "lockspace.h" |