From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jan 2015 22:25:52 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bc208e0ee0f46744aac95c29366144271a6962bb;p=openwrt%2Fstaging%2Fblogic.git

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

Pull btrfs fix from Chris Mason:
 "We have one more fix for btrfs in my for-linus branch - this was a bug
  in the new raid5/6 scrubbing support"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix raid56 scrub failed in xfstests btrfs/072
---

bc208e0ee0f46744aac95c29366144271a6962bb