From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Feb 2010 15:23:03 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=adbfbcd12af3d183957622a99ca009b665639b81;p=deliverable%2Flinux.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: apply updated fallocate i_size fix
  Btrfs: do not try and lookup the file extent when finishing ordered io
  Btrfs: Fix oopsen when dropping empty tree.
  Btrfs: remove BUG_ON() due to mounting bad filesystem
  Btrfs: make error return negative in btrfs_sync_file()
  Btrfs: fix race between allocate and release extent buffer.
---

adbfbcd12af3d183957622a99ca009b665639b81