Merge branch 'xfs-4.9-delalloc-rework' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 2 Oct 2016 22:52:51 +0000 (09:52 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 2 Oct 2016 22:52:51 +0000 (09:52 +1100)
1  2 
fs/xfs/libxfs/xfs_bmap.c

Simple merge