Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/super.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge