diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-06-14 09:34:46 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-06-14 09:34:46 -0400 |
| commit | b70b92e41d95fd906f05f6e98f61209201495fa7 (patch) | |
| tree | 594890f30f1d89d54eccfd2780dfc033bd2fdd06 /fs/xfs/xfs_inode.c | |
| parent | 1e68b2b2756fc3488ecbade5ad5f13302b3aaafc (diff) | |
| parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | ||