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:
e3ac3f2
4792b0d
)
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
author
Mark Brown
<broonie@linaro.org>
Wed, 21 May 2014 23:23:44 +0000
(
00:23
+0100)
committer
Mark Brown
<broonie@linaro.org>
Wed, 21 May 2014 23:23:44 +0000
(
00:23
+0100)
1
2
sound/soc/soc-pcm.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/soc/soc-pcm.c
Simple merge