git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
ocfs2
/
dlm
/
dlmast.c
diff --git
a/fs/ocfs2/dlm/dlmast.c
b/fs/ocfs2/dlm/dlmast.c
index
b7a25ef
..
12d5eb7
100644
(file)
--- a/
fs/ocfs2/dlm/dlmast.c
+++ b/
fs/ocfs2/dlm/dlmast.c
@@
-28,7
+28,6
@@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
-#include <linux/slab.h>
#include <linux/highmem.h>
#include <linux/init.h>
#include <linux/sysctl.h>