diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /fs/dlm/lock.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/dlm/lock.c')
| -rw-r--r-- | fs/dlm/lock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 46ffd3eeaaf..17903b49129 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | L: receive_xxxx_reply() <- R: send_xxxx_reply() | 56 | L: receive_xxxx_reply() <- R: send_xxxx_reply() |
| 57 | */ | 57 | */ |
| 58 | #include <linux/types.h> | 58 | #include <linux/types.h> |
| 59 | #include <linux/slab.h> | ||
| 59 | #include "dlm_internal.h" | 60 | #include "dlm_internal.h" |
| 60 | #include <linux/dlm_device.h> | 61 | #include <linux/dlm_device.h> |
| 61 | #include "memory.h" | 62 | #include "memory.h" |