From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Feb 2009 18:37:00 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.29-rc7~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64e71303e44f3697e4568147caa966de74bdb4fb;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: try committing transaction before returning ENOSPC
  Btrfs: add better -ENOSPC handling
---

64e71303e44f3697e4568147caa966de74bdb4fb