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

Signed-off-by: Chris Mason <[email protected]>

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