Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jan 2018 12:43:47 +0000 (12:43 +0000)
commit2f1eceda4d86c3157330292b68b1bc6c5df4e715
treedfdb743351e29bc0aa6c299c4c736daed51aba44
parent747c9084272f8cc9d445d026fbc889c099c4a3a2
parent845f80cb401c2ff6b9b8d75ebfc04b83b70268ef
parent52eee84e815e0fbaf9ada848ab5646314a529b61
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