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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
fs
/
ocfs2
/
acl.c
diff --git
a/fs/ocfs2/acl.c
b/fs/ocfs2/acl.c
index
90f2729
..
e913ad1
100644
(file)
--- a/
fs/ocfs2/acl.c
+++ b/
fs/ocfs2/acl.c
@@
-24,7
+24,6
@@
#include <linux/slab.h>
#include <linux/string.h>
-#define MLOG_MASK_PREFIX ML_INODE
#include <cluster/masklog.h>
#include "ocfs2.h"