diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-12-03 17:46:17 -0500 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-12-03 17:46:17 -0500 |
| commit | 6044e4386cd51dece882ea42352cdaaab0f24cad (patch) | |
| tree | cde51132ea9d6afefdf05ad621fc22bbb796d5f4 /fs/xfs/xfs_iops.c | |
| parent | c14fc01340dd0afe58d8671acc3ea5e907e707ae (diff) | |
| parent | b29c70f59870dad0945b0e0b3fe3758ad528e268 (diff) | |
Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
Conflicts:
fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_iops.c')
| -rw-r--r-- | fs/xfs/xfs_iops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index f14a3e5e4a0a..c50311cae1b1 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include "xfs_icache.h" | 35 | #include "xfs_icache.h" |
| 36 | #include "xfs_symlink.h" | 36 | #include "xfs_symlink.h" |
| 37 | #include "xfs_da_btree.h" | 37 | #include "xfs_da_btree.h" |
| 38 | #include "xfs_dir2_priv.h" | 38 | #include "xfs_dir2.h" |
| 39 | #include "xfs_trans_space.h" | 39 | #include "xfs_trans_space.h" |
| 40 | 40 | ||
| 41 | #include <linux/capability.h> | 41 | #include <linux/capability.h> |