Merge branch 'xfs-meta-uuid' into for-next

author Dave Chinner <david@fromorbit.com>

Wed, 29 Jul 2015 01:54:21 +0000 (11:54 +1000)

committer Dave Chinner <david@fromorbit.com>

Wed, 29 Jul 2015 01:54:21 +0000 (11:54 +1000)
author Dave Chinner <david@fromorbit.com>
Wed, 29 Jul 2015 01:54:21 +0000 (11:54 +1000)
committer Dave Chinner <david@fromorbit.com>
Wed, 29 Jul 2015 01:54:21 +0000 (11:54 +1000)
diff --cc fs/xfs/libxfs/xfs_attr_remote.c
Simple merge
diff --cc fs/xfs/libxfs/xfs_da_btree.c
Simple merge
diff --cc fs/xfs/libxfs/xfs_dir2_node.c
Simple merge
diff --cc fs/xfs/libxfs/xfs_sb.c
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Wed, 29 Jul 2015 01:54:21 +0000 (11:54 +1000)
committer	Dave Chinner <david@fromorbit.com>
	Wed, 29 Jul 2015 01:54:21 +0000 (11:54 +1000)
		1	2
fs/xfs/libxfs/xfs_attr_remote.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_da_btree.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_dir2_node.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_sb.c	patch \|	diff1 \|	diff2 \|	blob \| history