Merge branch 'xfs-freelist-cleanup' into for-next

author Dave Chinner <david@fromorbit.com>

Mon, 22 Jun 2015 22:48:43 +0000 (08:48 +1000)

committer Dave Chinner <david@fromorbit.com>

Mon, 22 Jun 2015 22:48:43 +0000 (08:48 +1000)
author Dave Chinner <david@fromorbit.com>
Mon, 22 Jun 2015 22:48:43 +0000 (08:48 +1000)
committer Dave Chinner <david@fromorbit.com>
Mon, 22 Jun 2015 22:48:43 +0000 (08:48 +1000)
diff --cc fs/xfs/libxfs/xfs_alloc.c
Simple merge
diff --cc fs/xfs/libxfs/xfs_alloc.h
Simple merge
diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge
diff --cc fs/xfs/libxfs/xfs_format.h
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Mon, 22 Jun 2015 22:48:43 +0000 (08:48 +1000)
committer	Dave Chinner <david@fromorbit.com>
	Mon, 22 Jun 2015 22:48:43 +0000 (08:48 +1000)
		1	2
fs/xfs/libxfs/xfs_alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_alloc.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_bmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_format.h	patch \|	diff1 \|	diff2 \|	blob \| history