summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-18 12:55:56 +0100
committerMark Brown <broonie@kernel.org>2018-01-18 12:55:56 +0100
commit0e987921bbcf6a46981dce9b9a17cfe265853992 (patch)
treed9fa9de9fcc0425dc8e6fcb7b0546dcae17a33ee /sound
parentMerge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs', 'a... (diff)
parentASoC: don't use rtd->codec on fsl-asoc-card (diff)
parentASoC: fsl_ssi: Fix build error (diff)
parentASoC: fsl_asrc: protect macro argument (diff)
parentASoC: hdac_hdmi: Add vendor id for Cannonlake HDMI codec (diff)
downloadlinux-0e987921bbcf6a46981dce9b9a17cfe265853992.tar.xz
linux-0e987921bbcf6a46981dce9b9a17cfe265853992.zip
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic/fsl_asrc' and 'asoc/topic/hdac_hdmi' into asoc-next