Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:29 +0000 (21:31 +0000)
1  2  3  4  5  6 
sound/soc/samsung/i2s.c
sound/soc/sunxi/sun8i-codec.c

Simple merge
Simple merge