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 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
fs
/
ocfs2
/
sysfile.c
diff --git
a/fs/ocfs2/sysfile.c
b/fs/ocfs2/sysfile.c
index
40e5370
..
bfe7190
100644
(file)
--- a/
fs/ocfs2/sysfile.c
+++ b/
fs/ocfs2/sysfile.c
@@
-25,7
+25,6
@@
#include <linux/fs.h>
#include <linux/types.h>
-#include <linux/slab.h>
#include <linux/highmem.h>
#define MLOG_MASK_PREFIX ML_INODE