Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration
authorChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:02 +0000 (15:26 -0500)
committerChris Mason <chris.mason@oracle.com>
Mon, 16 Jan 2012 20:26:02 +0000 (15:26 -0500)
commit27263e28321db438bc43dc0c0be432ce91526224
treeb7571dd52d6c1d48528e383d273b330da94439bd
parent64e05503ab5c73b2ffb8d55d2f7aab74f34fc691
parent19a39dce3b9bf0244d19a446718ad6f7605ff099
Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/super.c
fs/btrfs/volumes.c