summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 13:12:36 +0200
committerMark Brown <broonie@kernel.org>2017-09-01 13:12:36 +0200
commit7d630ce4d635b847c4c15606738fb0f5aa777cf3 (patch)
treef9de26be47012e3c1cf393404aa6b61855dd6483 /sound/soc/soc-jack.c
parentMerge remote-tracking branches 'asoc/topic/cs43130', 'asoc/topic/cs53l30', 'a... (diff)
parentASoC: dwc: Delete an error message for a failed memory allocation in dw_i2s_p... (diff)
parentASoC: codecs: es8316: constify snd_soc_dai_ops structures (diff)
parentASoC: fsi: Delete an error message for a failed memory allocation in fsi_probe() (diff)
parentASoC: fsl_dma: remove dma_object path member (diff)
parentASoC: hdmi-codec: Use different name for playback streams (diff)
downloadlinux-7d630ce4d635b847c4c15606738fb0f5aa777cf3.tar.xz
linux-7d630ce4d635b847c4c15606738fb0f5aa777cf3.zip
Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8316', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/hdmi' into asoc-next