diff options
author | Dave Chinner <david@fromorbit.com> | 2015-04-16 14:13:18 +0200 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-04-16 14:13:18 +0200 |
commit | 542c311813d5cb2e6f0dfa9557f41c829b8fb6a0 (patch) | |
tree | 573c5644eb966e44112016c9ae86e80251326223 /fs/open.c | |
parent | Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next (diff) | |
parent | xfs: using generic_file_direct_write() is unnecessary (diff) | |
download | linux-542c311813d5cb2e6f0dfa9557f41c829b8fb6a0.tar.xz linux-542c311813d5cb2e6f0dfa9557f41c829b8fb6a0.zip |
Merge branch 'xfs-dio-extend-fix' into for-next
Conflicts:
fs/xfs/xfs_file.c
Diffstat (limited to 'fs/open.c')
0 files changed, 0 insertions, 0 deletions