git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-linus
[sfrench/cifs-2.6.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_quotaops.c
diff --git
a/fs/xfs/linux-2.6/xfs_quotaops.c
b/fs/xfs/linux-2.6/xfs_quotaops.c
index 9ac8aea91529ed403920f746f9d7f52decc2802f..067cafbfc6357fee83a5adbf265e74ab93eeb999 100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_quotaops.c
+++ b/
fs/xfs/linux-2.6/xfs_quotaops.c
@@
-23,7
+23,6
@@
#include "xfs_ag.h"
#include "xfs_mount.h"
#include "xfs_quota.h"
-#include "xfs_log.h"
#include "xfs_trans.h"
#include "xfs_bmap_btree.h"
#include "xfs_inode.h"