Merge branch 'xfs-4.10-misc-fixes-1' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 9 Nov 2016 23:29:43 +0000 (10:29 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 9 Nov 2016 23:29:43 +0000 (10:29 +1100)
1  2 
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/xfs_aops.c

Simple merge
Simple merge