| commit | bc208e0ee0f46744aac95c29366144271a6962bb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 30 14:25:52 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 30 14:25:52 2015 -0800 |
| tree | d7336b6026ef51bf987273c1dc9c0a374052e5d8 | |
| parent | 92ef9ce301ed98b2b963d2f3c5367904efc69fba [diff] | |
| parent | 063c54dccdecb0479662778ddf54ee45aa55423d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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