Merge branch 'xfs-4.8-iomap-write' into for-next
authorDave Chinner <david@fromorbit.com>
Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)
1  2 
fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_inode.h

Simple merge
Simple merge