Merge branch 'raid56-experimental' into for-linus-3.9
Signed-off-by: NChris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
Showing
fs/btrfs/raid56.c
0 → 100644
此差异已折叠。
fs/btrfs/raid56.h
0 → 100644
此差异已折叠。
想要评论请 注册 或 登录