]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'raid56-experimental' into for-linus-3.9
authorChris Mason <chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:06:05 +0000 (14:06 -0500)
committerChris Mason <chris.mason@fusionio.com>
Wed, 20 Feb 2013 19:06:05 +0000 (14:06 -0500)
commit69684ff9d7f5ee0b8ed5fd7c9a943d8e393fbe37
treee1d19783e9c8b42198a69c17c9719fb90f302847
parent2d76699a4c1062a38a6a905b56fa187e5d630520
parent8f725ca3f3c8c897770630efaf6b6ea5a65b8e56
Merge branch 'raid56-experimental' into for-linus-3.9

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
12 files changed:
fs/btrfs/ctree.h
fs/btrfs/delayed-ref.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/scrub.c
fs/btrfs/transaction.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h