Merge branch 'xfs-setxattr-promotion' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 18 Jan 2016 21:16:08 +0000 (08:16 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 18 Jan 2016 21:16:08 +0000 (08:16 +1100)
1  2 
fs/xfs/libxfs/xfs_format.h
fs/xfs/xfs_inode.c

Simple merge
Simple merge