Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/ioctl.c
fs/btrfs/ioctl.h
fs/btrfs/transaction.c
fs/btrfs/transaction.h
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Showing
This diff is collapsed.
This diff is collapsed.
fs/btrfs/qgroup.c
0 → 100644
This diff is collapsed.
Please register or sign in to comment