]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
authorChris Mason <chris.mason@fusionio.com>
Wed, 25 Jul 2012 20:11:38 +0000 (16:11 -0400)
committerChris Mason <chris.mason@fusionio.com>
Wed, 25 Jul 2012 20:11:38 +0000 (16:11 -0400)
commitb478b2baa37ac99fc04a30809c780dd5dfd43595
treebed7af1466e5b1e0b0501eba18f77c804a864d7d
parent67c9684f48ea9cbc5e9b8a1feb3151800e9dcc22
parent6f72c7e20dbaea55f04546de69586c84a3654503
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>
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/ioctl.c
fs/btrfs/ioctl.h
fs/btrfs/transaction.c
fs/btrfs/transaction.h