Merge branch 'for-next-next-4.9-20160909' into for-next-20160909

author David Sterba <dsterba@suse.com>

Fri, 9 Sep 2016 09:22:03 +0000 (11:22 +0200)

committer David Sterba <dsterba@suse.com>

Fri, 9 Sep 2016 09:22:03 +0000 (11:22 +0200)
author David Sterba <dsterba@suse.com>
Fri, 9 Sep 2016 09:22:03 +0000 (11:22 +0200)
committer David Sterba <dsterba@suse.com>
Fri, 9 Sep 2016 09:22:03 +0000 (11:22 +0200)
diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/extent-tree.c
Simple merge
author	David Sterba <dsterba@suse.com>
	Fri, 9 Sep 2016 09:22:03 +0000 (11:22 +0200)
committer	David Sterba <dsterba@suse.com>
	Fri, 9 Sep 2016 09:22:03 +0000 (11:22 +0200)
		1	2
fs/btrfs/ctree.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	patch \|	diff1 \|	diff2 \|	blob \| history