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:
96da4e5
54d96a4
)
Merge branch 'topic/rt286' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
author
Mark Brown
<broonie@kernel.org>
Tue, 27 Jan 2015 17:52:51 +0000
(17:52 +0000)
committer
Mark Brown
<broonie@kernel.org>
Tue, 27 Jan 2015 17:52:51 +0000
(17:52 +0000)
Conflicts:
sound/soc/codecs/rt286.c
1
2
sound/soc/codecs/rt286.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/soc/codecs/rt286.c
Simple merge