Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next

author Dave Chinner <david@fromorbit.com>

Wed, 10 Feb 2016 04:03:42 +0000 (15:03 +1100)

committer Dave Chinner <david@fromorbit.com>

Wed, 10 Feb 2016 04:03:42 +0000 (15:03 +1100)
author Dave Chinner <david@fromorbit.com>
Wed, 10 Feb 2016 04:03:42 +0000 (15:03 +1100)
committer Dave Chinner <david@fromorbit.com>
Wed, 10 Feb 2016 04:03:42 +0000 (15:03 +1100)
diff --cc fs/xfs/xfs_inode.c
Simple merge
diff --cc fs/xfs/xfs_log_recover.c
Simple merge
diff --cc fs/xfs/xfs_mount.c
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Wed, 10 Feb 2016 04:03:42 +0000 (15:03 +1100)
committer	Dave Chinner <david@fromorbit.com>
	Wed, 10 Feb 2016 04:03:42 +0000 (15:03 +1100)
		1	2
fs/xfs/xfs_inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log_recover.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_mount.c	patch \|	diff1 \|	diff2 \|	blob \| history