Merge branch 'xfs-attr-cleanup' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 14 May 2014 23:39:28 +0000 (09:39 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 14 May 2014 23:39:28 +0000 (09:39 +1000)
Conflicts:
fs/xfs/xfs_attr.c


Trivial merge