git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
[safe/jmp/linux-2.6]
/
fs
/
ocfs2
/
mmap.c
diff --git
a/fs/ocfs2/mmap.c
b/fs/ocfs2/mmap.c
index
3973761
..
7898bd3
100644
(file)
--- a/
fs/ocfs2/mmap.c
+++ b/
fs/ocfs2/mmap.c
@@
-25,7
+25,6
@@
#include <linux/fs.h>
#include <linux/types.h>
-#include <linux/slab.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
#include <linux/uio.h>