projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
485372d
9eccca0
)
Merge tag 'v4.0-rc3' into asoc-rt5670
author
Mark Brown
<broonie@kernel.org>
Tue, 10 Mar 2015 10:37:02 +0000
(10:37 +0000)
committer
Mark Brown
<broonie@kernel.org>
Tue, 10 Mar 2015 10:37:02 +0000
(10:37 +0000)
Linux 4.0-rc3
Conflicts:
sound/soc/codecs/rt5670.c
1
2
sound/soc/codecs/rt5670.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/soc/codecs/rt5670.c
Simple merge