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)
commitaa2dfb372a2a647beedac163ce6f8b0fcbefac29
treeff64f4d4921df2f0fbe5b356dc9b2384c7957dc1
parent945d8962ceee6bb273365d0bdf42f763225b290f
parent73c5de0051533cbdf2bb656586c3eb21a475aa7d
Merge branch 'allocator' of git://git./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