Merge branch 'xfs-logging-fixes' into for-next

author Dave Chinner <david@fromorbit.com>

Mon, 12 Oct 2015 07:37:58 +0000 (18:37 +1100)

committer Dave Chinner <david@fromorbit.com>

Mon, 12 Oct 2015 07:37:58 +0000 (18:37 +1100)
author Dave Chinner <david@fromorbit.com>
Mon, 12 Oct 2015 07:37:58 +0000 (18:37 +1100)
committer Dave Chinner <david@fromorbit.com>
Mon, 12 Oct 2015 07:37:58 +0000 (18:37 +1100)
diff --cc fs/xfs/libxfs/xfs_alloc.c
Simple merge
diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge
diff --cc fs/xfs/xfs_iomap.c
Simple merge
diff --cc fs/xfs/xfs_log.c
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Mon, 12 Oct 2015 07:37:58 +0000 (18:37 +1100)
committer	Dave Chinner <david@fromorbit.com>
	Mon, 12 Oct 2015 07:37:58 +0000 (18:37 +1100)
		1	2
fs/xfs/libxfs/xfs_alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_bmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_iomap.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log.c	patch \|	diff1 \|	diff2 \|	blob \| history