projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b4bbae 62e5f67)
Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core
authorMark Brown <broonie@linaro.org>
Wed, 4 Dec 2013 11:54:29 +0000 (11:54 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 4 Dec 2013 11:54:29 +0000 (11:54 +0000)
Conflicts (Trivial add/delete):
sound/soc/soc-pcm.c

1  2 
sound/soc/soc-pcm.c patch | diff1 | diff2 | blob | history

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