summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-12 13:29:08 +0100
committerMark Brown <broonie@kernel.org>2018-01-12 13:29:08 +0100
commit041627790b02af1f68c003018ecfa868b02f4191 (patch)
treeb89b5aad613b2d57d7a035c13981c8534436de1c /include/sound
parentMerge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/dai-drv', 'as... (diff)
parentASoC: eukrea-tlv320: Remove include line of fsl_ssi.h (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)
downloadlinux-041627790b02af1f68c003018ecfa868b02f4191.tar.xz
linux-041627790b02af1f68c003018ecfa868b02f4191.zip
Merge remote-tracking branches 'asoc/topic/eukrea-tlv320', 'asoc/topic/fsl', 'asoc/topic/fsl-ssi' and 'asoc/topic/fsl_asrc' into asoc-next