summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_conexant.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-30 15:16:31 +0200
committerMark Brown <broonie@kernel.org>2017-04-30 15:16:31 +0200
commit65fd5252b40c68177946001edf2078bbbefa2c83 (patch)
treeafbd3d6c3d35ec7ae6fd7c14a096fb170eeeea0a /sound/pci/hda/patch_conexant.c
parentMerge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', '... (diff)
parentASoC: sta529: Add OF device ID table (diff)
parentASoC: sti: Fix error handling if of_clk_get() fails (diff)
parentASoC: stm32: add SAI driver (diff)
parentMerge branch 'fix/sun8i' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff)
parentASoC: tas2552: Propagate the error code in suspend/resume (diff)
downloadlinux-65fd5252b40c68177946001edf2078bbbefa2c83.tar.xz
linux-65fd5252b40c68177946001edf2078bbbefa2c83.zip
Merge remote-tracking branches 'asoc/topic/sta529', 'asoc/topic/sti', 'asoc/topic/stm', 'asoc/topic/sunxi' and 'asoc/topic/tas2552' into asoc-next