diff options
| author | Alex Elder | 2010-06-04 20:22:30 +0200 |
|---|---|---|
| committer | Alex Elder | 2010-06-04 20:22:30 +0200 |
| commit | 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch) | |
| tree | fdb99e686fa40e79cc53f80dfed58e9b548ed4eb /fs/xfs/linux-2.6/xfs_quotaops.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | xfs: improve xfs_isilocked (diff) | |
| download | kernel-qcow2-linux-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.tar.gz kernel-qcow2-linux-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.tar.xz kernel-qcow2-linux-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_quotaops.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_quotaops.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_quotaops.c b/fs/xfs/linux-2.6/xfs_quotaops.c index 9ac8aea91529..067cafbfc635 100644 --- 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" |