]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs...
authorChris Mason <chris.mason@oracle.com>
Sun, 22 May 2011 16:36:34 +0000 (12:36 -0400)
committerChris Mason <chris.mason@oracle.com>
Sun, 22 May 2011 16:36:34 +0000 (12:36 -0400)
commit7fd4548da552d6d47b571d92743151113e956aa9
treeff64f4d4921df2f0fbe5b356dc9b2384c7957dc1
parente70b0759931f28ee23c6a0adf9ce0d7d66aeb4b7
parent75202b3e9ae1dc34249d0098d65d497db6f99adb
Merge branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/super.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h