From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jun 2011 20:32:14 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: v3.0-rc5~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af4087e0e682df12bdffec5cfafc2fec9208716e;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  btrfs: fix inconsonant inode information
  Btrfs: make sure to update total_bitmaps when freeing cache V3
  Btrfs: fix type mismatch in find_free_extent()
  Btrfs: make sure to record the transid in new inodes
---

af4087e0e682df12bdffec5cfafc2fec9208716e