aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 12:12:58 +0100
committerMark Brown <broonie@kernel.org>2017-09-01 12:12:58 +0100
commitcb2b0d7c6b961b333be22184ff3890eff0a02162 (patch)
treed2cc03472bd1de5efdcee6d9ec28a6c37de3d686 /sound
parentMerge remote-tracking branches 'asoc/topic/rk3036', 'asoc/topic/rockchip', 'asoc/topic/rt274' and 'asoc/topic/rt5514' into asoc-next (diff)
parentASoC: rt5663: constify acpi_device_id. (diff)
parentASoC: rt5616: constify snd_soc_dai_ops structure (diff)
parentASoC: rt5645: Add jack detection workaround for MINIX Z83-4 based devices (diff)
parentASoC: rt5659: constify acpi_device_id. (diff)
parentASoC: rt5663: Add delay for jack plug in (diff)
downloadlinux-dev-cb2b0d7c6b961b333be22184ff3890eff0a02162.tar.xz
linux-dev-cb2b0d7c6b961b333be22184ff3890eff0a02162.zip
Merge remote-tracking branches 'asoc/topic/rt5563', 'asoc/topic/rt5616', 'asoc/topic/rt5645', 'asoc/topic/rt5659' and 'asoc/topic/rt5663' into asoc-next