Merge branch 'dev/fst-followup' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Chris Mason <clm@fb.com>

Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)

committer Chris Mason <clm@fb.com>

Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)
author Chris Mason <clm@fb.com>
Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)
committer Chris Mason <clm@fb.com>
Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)
diff --cc fs/btrfs/disk-io.c
Simple merge
diff --cc fs/btrfs/free-space-tree.c
Simple merge
author	Chris Mason <clm@fb.com>
	Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)
committer	Chris Mason <clm@fb.com>
	Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)
		1	2
fs/btrfs/disk-io.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/free-space-tree.c	patch \|	diff1 \|	diff2 \|	blob \| history