diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-03-13 09:14:43 +0100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-03-13 09:14:43 +0100 |
| commit | fe986f9d88ab8079c91669b7f175081f15491a80 (patch) | |
| tree | 73be54e2c5378750dee0ebc0720af5143d2c4dc6 /fs/ntfs | |
| parent | Merge branch 'xfs-bug-fixes-for-3.15-2' into for-next (diff) | |
| parent | xfs: allow linkat() on O_TMPFILE files (diff) | |
| download | linux-fe986f9d88ab8079c91669b7f175081f15491a80.tar.xz linux-fe986f9d88ab8079c91669b7f175081f15491a80.zip | |
Merge branch 'xfs-O_TMPFILE-support' into for-next
Conflicts:
fs/xfs/xfs_trans_resv.c
- fix for XFS_INODE_CLUSTER_SIZE macro removal
Diffstat (limited to 'fs/ntfs')
0 files changed, 0 insertions, 0 deletions