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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
fs
/
ext4
/
mballoc.h
diff --git
a/fs/ext4/mballoc.h
b/fs/ext4/mballoc.h
index
75e34f6
..
c96bb19
100644
(file)
--- a/
fs/ext4/mballoc.h
+++ b/
fs/ext4/mballoc.h
@@
-19,7
+19,6
@@
#include <linux/seq_file.h>
#include <linux/version.h>
#include <linux/blkdev.h>
-#include <linux/marker.h>
#include <linux/mutex.h>
#include "ext4_jbd2.h"
#include "ext4.h"