Merge branch 'xfs-ioctl-setattr-cleanup' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 1 Feb 2015 23:57:30 +0000 (10:57 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 1 Feb 2015 23:57:30 +0000 (10:57 +1100)
1  2 
fs/xfs/xfs_ioctl.c

Simple merge