summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-30 23:25:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-30 23:25:52 +0100
commitbc208e0ee0f46744aac95c29366144271a6962bb (patch)
treed7336b6026ef51bf987273c1dc9c0a374052e5d8 /arch/x86
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
parentbtrfs: fix raid56 scrub failed in xfstests btrfs/072 (diff)
downloadlinux-bc208e0ee0f46744aac95c29366144271a6962bb.tar.xz
linux-bc208e0ee0f46744aac95c29366144271a6962bb.zip
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
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions