diff options
| author |   Dave Chinner <david@fromorbit.com> | 2015-03-25 14:29:13 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-03-25 14:29:13 +1100 |
| commit | d41bb03444147305e955cdd53753f0493e4d9e28 (patch) | |
| tree | 37535eb32e725933b0c24df5c52c123b187fa910 /include/linux | |
| parent | Merge branch 'xfs-mmap-lock' into for-next (diff) | |
| parent | xfs: add RENAME_WHITEOUT support (diff) | |
Merge branch 'xfs-rename-whiteout' into for-next
Conflicts:
fs/xfs/xfs_inode.c
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions