Skip to content
Commit 113c1cb5 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus



This is the kernel portion of btrfs send/receive

Conflicts:
	fs/btrfs/Makefile
	fs/btrfs/backref.h
	fs/btrfs/ctree.c
	fs/btrfs/ioctl.c
	fs/btrfs/ioctl.h

Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parents cd1cfc49 31db9f7c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment