diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-12 21:28:59 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-12 21:28:59 -0500 |
| commit | fd40261354802b0f05f6f67121235aa002e87069 (patch) | |
| tree | 935f23fa1528f6fe5a078383c9343907ea27fbb3 /fs/xfs/xfs_inode.c | |
| parent | f3ad116588151b3371ae4e092290e4f48e62b8bb (diff) | |
| parent | e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 (diff) | |
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 123b20c8cbf..1f22d65fed0 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -49,7 +49,6 @@ #include "xfs_utils.h" #include "xfs_dir2_trace.h" #include "xfs_quota.h" -#include "xfs_acl.h" #include "xfs_filestream.h" #include "xfs_vnodeops.h" |