git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd1cfc4 31db9f7)
Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus
authorChris Mason <chris.mason@fusionio.com>
Wed, 25 Jul 2012 23:17:39 +0000 (19:17 -0400)
committerChris Mason <chris.mason@fusionio.com>
Wed, 25 Jul 2012 23:19:10 +0000 (19:19 -0400)
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>

Trivial merge
Pandora Kernel Repository