From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Feb 2015 18:34:24 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: v4.0-rc2~19
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=7dac5cb1bc8c4bc420f0cafd9c42d693eadfdd7e

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

Pull btrfs fix from Chris Mason:
 "I'm still testing more fixes, but I wanted to get out the fix for the
  btrfs raid5/6 memory corruption I mentioned in my merge window pull"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix allocation size calculations in alloc_btrfs_bio
---

7dac5cb1bc8c4bc420f0cafd9c42d693eadfdd7e