Merge branch 'xfs-misc-fixes-4.6' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:30:12 +0000 (09:30 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:30:12 +0000 (09:30 +1100)
1  2 
fs/xfs/xfs_aops.c

Simple merge