projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
92ef9ce
063c54d
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 30 Jan 2015 22:25:52 +0000
(14:25 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 30 Jan 2015 22:25:52 +0000
(14:25 -0800)
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
Trivial merge