From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Apr 2015 00:40:30 +0000 (-0700)
Subject: Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: MMI-PSA29.97-13-9~10158
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f583381f506dc53b9d3e98cf9d6577323eb3fcd2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull btrfs fixes from Chris Mason:
 "Filipe hit two problems in my block group cache patches.  We finalized
  the fixes last week and ran through more tests"

* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: prevent list corruption during free space cache processing
  Btrfs: fix inode cache writeout
---

f583381f506dc53b9d3e98cf9d6577323eb3fcd2