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

author Chris Mason <[email protected]>

Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)

committer Chris Mason <[email protected]>

Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)
author Chris Mason <[email protected]>
Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)
committer Chris Mason <[email protected]>
Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -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 <[email protected]>
	Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -0800)
committer	Chris Mason <[email protected]>
	Wed, 23 Dec 2015 21:28:35 +0000 (13:28 -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