]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs...
authorChris Mason <chris.mason@oracle.com>
Fri, 29 Oct 2010 13:27:49 +0000 (09:27 -0400)
committerChris Mason <chris.mason@oracle.com>
Fri, 29 Oct 2010 13:27:49 +0000 (09:27 -0400)
commit3d47dacd8aae05cfea857908ad3b86023b9ffb48
tree2896588127c4dd6c2867ef09e7e3cdd83391f8ae
parentc0a2de320bc433b82d298bda23d1c2ab6a2fd8c2
parent26573e47e8c439c2d8bbe830485e79fc40a0dea2
Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

Conflicts:
fs/btrfs/extent-tree.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/relocation.c
fs/btrfs/super.c
fs/btrfs/transaction.c