projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e6a469
40c5796
)
Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a
author
Mark Brown
<broonie@kernel.org>
Tue, 1 May 2018 21:12:18 +0000
(06:12 +0900)
committer
Mark Brown
<broonie@kernel.org>
Tue, 1 May 2018 21:12:18 +0000
(06:12 +0900)
conflict between a fix and new development in mtk
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff