Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:56 +0000 (11:55 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:56 +0000 (11:55 +0000)
1  2  3  4  5 
sound/soc/codecs/hdac_hdmi.c
sound/soc/fsl/fsl_asrc.h

Simple merge
Simple merge