Merge branch 'xfs-misc-fixes-for-3.20-3' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 1 Feb 2015 23:03:18 +0000 (10:03 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 1 Feb 2015 23:03:18 +0000 (10:03 +1100)
1  2 
fs/xfs/xfs_inode.h

Simple merge