summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/fsl_ssi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 03:16:03 +0100
committerMark Brown <broonie@kernel.org>2015-10-26 03:16:03 +0100
commitf72362e6b7522040c16a224d5dcf2022e5468803 (patch)
treed1e532736f443954551f04a7ddfd852398f7c6e3 /sound/soc/fsl/fsl_ssi.c
parentMerge remote-tracking branch 'asoc/topic/da7219' into asoc-next (diff)
parentASoC: dwc: add check for master/slave format (diff)
parentASoC: es8328: harmless underflow in es8328_put_deemph() (diff)
parentASoC: fsl: Use #ifdef instead of #if for CONFIG_PM_SLEEP (diff)
parentASoC: fsl-asoc-card: add AC'97 support (diff)
downloadlinux-f72362e6b7522040c16a224d5dcf2022e5468803.tar.xz
linux-f72362e6b7522040c16a224d5dcf2022e5468803.zip
Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic/fsl' and 'asoc/topic/fsl-card' into asoc-next