projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02dc14d ca94085 d32e03f 534dcd7)
Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:59:18 +0000 (15:59 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:59:18 +0000 (15:59 +0100)
1  2  3  4 
sound/soc/codecs/wm8996.c patch | diff1 | diff2 | diff3 | diff4 | blob | history
sound/soc/zte/zx296702-i2s.c patch | diff1 | diff2 | diff3 | diff4 | blob | history

diff --cc sound/soc/codecs/wm8996.c
Simple merge
diff --cc sound/soc/zte/zx296702-i2s.c
Simple merge