From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2014 03:21:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=da83fc6e0f379bf80d68d34cca38788a046a71f4;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

Pull btrfs fixes from Chris Mason:
 "We have two more fixes in my for-linus branch.

  I was hoping to also include a fix for a btrfs deadlock with
  compression enabled, but we're still nailing that one down"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: test for valid bdev before kobj removal in btrfs_rm_device
  Btrfs: fix abnormal long waiting in fsync
---

da83fc6e0f379bf80d68d34cca38788a046a71f4