From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Apr 2011 15:26:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v2.6.39-rc5~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019793b7554b18818624e9cf7a2ee8ba8cf6bda0;p=pandora-kernel.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: cleanup error handling in inode.c
  Btrfs: put the right bio if we have an error
  Btrfs: free bitmaps properly when evicting the cache
  Btrfs: Free free_space item properly in btrfs_trim_block_group()
  btrfs: add missing spin_unlock to a rare exit path
  Btrfs: check return value of kmalloc()
  btrfs: fix wrong allocating flag when reading page
  Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()
---

019793b7554b18818624e9cf7a2ee8ba8cf6bda0
Reading git-diff-tree failed