Merge branch 'xfs-commit-cleanup' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:55:48 +0000 (13:55 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:55:48 +0000 (13:55 +1000)
Conflicts:
fs/xfs/xfs_attr_inactive.c


Trivial merge