tree 573c5644eb966e44112016c9ae86e80251326223
parent 6a63ef064b2444883ce8b68b0779d0c739d27204
parent 0cefb29e6a63727bc7606c47fc538467594ef112
author Dave Chinner <david@fromorbit.com> 1429186398 +1000
committer Dave Chinner <david@fromorbit.com> 1429186398 +1000

Merge branch 'xfs-dio-extend-fix' into for-next

Conflicts:
	fs/xfs/xfs_file.c