Merge branch 'allocator' of...

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>