Merge remote-tracking branches 'asoc/topic/sun4i-i2s', 'asoc/topic/sun8i-codec',...
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:27:37 +0000 (15:27 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:27:37 +0000 (15:27 +0000)
1  2  3  4  5  6 
include/sound/soc-dai.h
sound/soc/sunxi/sun4i-i2s.c

Simple merge
Simple merge