From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 16:53:40 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: v3.2-rc3~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af36d15f58a3560617f1497ae011c3192049e40e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: remove free-space-cache.c WARN during log replay
  Btrfs: sectorsize align offsets in fiemap
  Btrfs: clear pages dirty for io and set them extent mapped
  Btrfs: wait on caching if we're loading the free space cache
  Btrfs: prefix resize related printks with btrfs:
  btrfs: fix stat blocks accounting
  Btrfs: avoid unnecessary bitmap search for cluster setup
  Btrfs: fix to search one more bitmap for cluster setup
  btrfs: mirror_num should be int, not u64
  btrfs: Fix up 32/64-bit compatibility for new ioctls
  Btrfs: fix barrier flushes
  Btrfs: fix tree corruption after multi-thread snapshots and inode_cache flush
---

af36d15f58a3560617f1497ae011c3192049e40e