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)
Signed-off-by: Chris Mason <chris.mason@oracle.com>

Trivial merge