From: Chris Mason <chris.mason@fusionio.com>
Date: Wed, 25 Jul 2012 23:17:39 +0000 (-0400)
Subject: Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus
X-Git-Tag: v3.6-rc1~81^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=113c1cb530e10bcada93d88ffaa6b521aae2d251;p=pandora-kernel.git

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: Chris Mason <chris.mason@fusionio.com>
---

113c1cb530e10bcada93d88ffaa6b521aae2d251
Reading git-diff-tree failed