From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jun 2009 18:54:28 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.30~20
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=064e38aaded5269e573ac1c765284fd65c8ebd13;p=~andy%2Flinux

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: Fix oops and use after free during space balancing
  Btrfs: set device->total_disk_bytes when adding new device
---

064e38aaded5269e573ac1c765284fd65c8ebd13