tree ad217372c4d6f8cf49ceb465b928907b9d94da89
parent 0f70abe2b39d19171d4133d2ffdf77fb9113106a
author Chris Mason <chris.mason@oracle.com> 1172768661 -0500
committer David Woodhouse <dwmw2@hera.kernel.org> 1172768661 -0500

Btrfs: merge on the way down during deletes

Signed-off-by: Chris Mason <chris.mason@oracle.com>