From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Feb 2011 16:00:35 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: 2.1b_release~5266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=007a14af2649c9ac77f38cd23469518ffb8b355a;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: check return value of alloc_extent_map()
  Btrfs - Fix memory leak in btrfs_init_new_device()
  btrfs: prevent heap corruption in btrfs_ioctl_space_info()
  Btrfs: Fix balance panic
  Btrfs: don't release pages when we can't clear the uptodate bits
  Btrfs: fix page->private races
---

007a14af2649c9ac77f38cd23469518ffb8b355a