Merge branch 'iomap-fixes-4.8-rc3' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 17 Aug 2016 01:13:37 +0000 (11:13 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 17 Aug 2016 01:13:37 +0000 (11:13 +1000)
1  2 
fs/xfs/xfs_iomap.c

Simple merge