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)
commite942f883bc6651d50be139477baf6fb0eed3d5bb
treee1d19783e9c8b42198a69c17c9719fb90f302847
parentb2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b
parent0e4e02636611dbf89a2f36320a32054f9936d6cb
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