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)
Conflicts:
fs/xfs/xfs_file.c

1  2 
fs/xfs/xfs_file.c
fs/xfs/xfs_trace.h

Simple merge
Simple merge