projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c08152 0f2780a)
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:15 +0000 (16:31 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:15 +0000 (16:31 +0100)
1  2 
sound/soc/codecs/wm_adsp.c patch | diff1 | diff2 | blob | history
sound/soc/soc-pcm.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/codecs/wm_adsp.c
Simple merge
diff --cc sound/soc/soc-pcm.c
Simple merge