Merge branch 'xfs-dio-extend-fix' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 16 Apr 2015 12:13:18 +0000 (22:13 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 16 Apr 2015 12:13:18 +0000 (22:13 +1000)
commit542c311813d5cb2e6f0dfa9557f41c829b8fb6a0
tree573c5644eb966e44112016c9ae86e80251326223
parent6a63ef064b2444883ce8b68b0779d0c739d27204
parent0cefb29e6a63727bc7606c47fc538467594ef112
Merge branch 'xfs-dio-extend-fix' into for-next

Conflicts:
fs/xfs/xfs_file.c
fs/xfs/xfs_file.c
fs/xfs/xfs_trace.h