Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan...

author Chris Mason <clm@fb.com>

Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)

committer Chris Mason <clm@fb.com>

Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
author Chris Mason <clm@fb.com>
Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
committer Chris Mason <clm@fb.com>
Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
diff --cc fs/btrfs/extent-tree.c
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge
author	Chris Mason <clm@fb.com>
	Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
committer	Chris Mason <clm@fb.com>
	Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
		1	2
fs/btrfs/extent-tree.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	patch \|	diff1 \|	diff2 \|	blob \| history