projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b8bd8b 20bb018)
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:32 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:32 +0000 (00:23 +0000)
1  2 
include/sound/soc-dapm.h patch | diff1 | diff2 | blob | history
sound/soc/soc-dapm.c patch | diff1 | diff2 | blob | history

diff --cc include/sound/soc-dapm.h
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge