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)
commit0e987921bbcf6a46981dce9b9a17cfe265853992
treed9fa9de9fcc0425dc8e6fcb7b0546dcae17a33ee
parent262db3bea59f5277722ae00d3a86c4230cf7af2b
parent845f80cb401c2ff6b9b8d75ebfc04b83b70268ef
parenta5a86a7f87d7b684f0369e1f207bb294cfa58dde
parentd1b726a9018e3f684ce190a1cbe012cb64f363d8
parent5fb6e0a1a933cfe13200ae0ae7589263236fa108
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic/fsl_asrc' and 'asoc/topic/hdac_hdmi' into asoc-next
sound/soc/codecs/hdac_hdmi.c
sound/soc/fsl/fsl_asrc.h