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)
commit4ea79766168b64766d6c9fcdaa9fab83a6cfebcf
tree7b29eaf46119a920f277b5cd13c818e2d35beafa
parent4497f28750cd129a669e32b7810dd755102aebbd
parentf78c3901074e113a04150230087f1d76033bb0a4
Merge branch 'xfs-commit-cleanup' into for-next

Conflicts:
fs/xfs/xfs_attr_inactive.c
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_sb.c
fs/xfs/xfs_aops.c
fs/xfs/xfs_attr_inactive.c
fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_file.c
fs/xfs/xfs_fsops.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_iops.c
fs/xfs/xfs_log_recover.c