Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Chris Mason <clm@fb.com>

Wed, 20 Jan 2016 02:21:00 +0000 (18:21 -0800)

committer Chris Mason <clm@fb.com>

Wed, 20 Jan 2016 02:21:00 +0000 (18:21 -0800)
author Chris Mason <clm@fb.com>
Wed, 20 Jan 2016 02:21:00 +0000 (18:21 -0800)
committer Chris Mason <clm@fb.com>
Wed, 20 Jan 2016 02:21:00 +0000 (18:21 -0800)
diff --cc fs/btrfs/extent-tree.c
Simple merge
diff --cc fs/btrfs/scrub.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge
author	Chris Mason <clm@fb.com>
	Wed, 20 Jan 2016 02:21:00 +0000 (18:21 -0800)
committer	Chris Mason <clm@fb.com>
	Wed, 20 Jan 2016 02:21:00 +0000 (18:21 -0800)
		1	2
fs/btrfs/extent-tree.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/scrub.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	patch \|	diff1 \|	diff2 \|	blob \| history