Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration
Chris Mason [Mon, 16 Jan 2012 20:26:02 +0000 (15:26 -0500)]
1  2 
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/super.c
fs/btrfs/volumes.c

Simple merge
Simple merge
Simple merge
Simple merge