projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5c315a7 1821ecd)
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)
commit91c5ef5c71d29b477739e73c25df2a9e37d3191a
treebed7af1466e5b1e0b0501eba18f77c804a864d7dtree | snapshot
parent5c315a7d7225cd000de9f5ca425f8877d927cebdcommit | diff
parent1821ecdb8ee389e7ac87be1a6e37de4568aa0678commit | diff
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 diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.h diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
fs/btrfs/transaction.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.