From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Apr 2012 02:41:27 +0000 (-0700)
Subject: Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=659e45d8a0aca8619f0d308448c480279fa002b6;p=linux-edison.git

Merge branch 'for-linus-min' of git://git./linux/kernel/git/mason/linux-btrfs

Pull the minimal btrfs branch from Chris Mason:
 "We have a use-after-free in there, along with errors when mount -o
  discard is enabled, and a BUG_ON(we should compile with UP more
  often)."

* 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: use commit root when loading free space cache
  Btrfs: fix use-after-free in __btrfs_end_transaction
  Btrfs: check return value of bio_alloc() properly
  Btrfs: remove lock assert from get_restripe_target()
  Btrfs: fix eof while discarding extents
  Btrfs: fix uninit variable in repair_eb_io_failure
  Revert "Btrfs: increase the global block reserve estimates"
---

659e45d8a0aca8619f0d308448c480279fa002b6