Btrfs: Fixup the code to merge during path walks
[linux-2.6-block.git] / fs /
drwxr-xr-x   ..
drwxr-xr-x - btrfs