Merge branch 'misc-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

author Chris Mason <clm@fb.com>

Wed, 8 Jun 2016 21:36:12 +0000 (14:36 -0700)

committer Chris Mason <clm@fb.com>

Wed, 8 Jun 2016 21:36:12 +0000 (14:36 -0700)
author Chris Mason <clm@fb.com>
Wed, 8 Jun 2016 21:36:12 +0000 (14:36 -0700)
committer Chris Mason <clm@fb.com>
Wed, 8 Jun 2016 21:36:12 +0000 (14:36 -0700)
diff --cc fs/btrfs/disk-io.c
Simple merge
diff --cc fs/btrfs/super.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge
author	Chris Mason <clm@fb.com>
	Wed, 8 Jun 2016 21:36:12 +0000 (14:36 -0700)
committer	Chris Mason <clm@fb.com>
	Wed, 8 Jun 2016 21:36:12 +0000 (14:36 -0700)
		1	2
fs/btrfs/disk-io.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	patch \|	diff1 \|	diff2 \|	blob \| history