diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-11 17:56:49 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-11 17:56:49 -0400 |
| commit | 35fd035968de4f674b9d62ee7b1d80ab7a50c384 (patch) | |
| tree | 53a936ecdf8e9c59735fa4e7794ccb503b06d5d5 /fs/xfs/xfs_inode.c | |
| parent | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (diff) | |
| parent | ef14f0c1578dce4b688726eb2603e50b62d6665a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
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 123b20c8cbf2..1f22d65fed0a 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include "xfs_utils.h" | 49 | #include "xfs_utils.h" |
| 50 | #include "xfs_dir2_trace.h" | 50 | #include "xfs_dir2_trace.h" |
| 51 | #include "xfs_quota.h" | 51 | #include "xfs_quota.h" |
| 52 | #include "xfs_acl.h" | ||
| 53 | #include "xfs_filestream.h" | 52 | #include "xfs_filestream.h" |
| 54 | #include "xfs_vnodeops.h" | 53 | #include "xfs_vnodeops.h" |
| 55 | 54 | ||