From: Linus Torvalds Date: Thu, 19 Mar 2009 21:49:55 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fe2fd6cc346cc7199a52250e8fb594852b2a321b;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: Clear space_info full when adding new devices Btrfs: Fix locking around adding new space_info --- fe2fd6cc346cc7199a52250e8fb594852b2a321b