diff options
| author |   Chris Mason <chris.mason@fusionio.com> | 2013-02-05 10:04:03 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 10:04:03 -0500 |
| commit | 0e4e02636611dbf89a2f36320a32054f9936d6cb (patch) | |
| tree | 18b4ecc6c3812770b29729d7abbdc673ffd73a41 /fs/btrfs/delayed-ref.h | |
| parent | Btrfs: remove conflicting check for minimum number of devices in raid56 (diff) | |
| parent | Btrfs: fix repeated delalloc work allocation (diff) | |
| download | linux-dev-0e4e02636611dbf89a2f36320a32054f9936d6cb.tar.xz linux-dev-0e4e02636611dbf89a2f36320a32054f9936d6cb.zip | |
Merge branch 'for-linus' into raid56-experimental
Conflicts:
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/delayed-ref.h')
0 files changed, 0 insertions, 0 deletions