summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/s3c2412-i2s.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-25 22:22:15 +0100
committerMark Brown <broonie@linaro.org>2014-03-25 22:22:15 +0100
commitc159a85013afbb8283f0c7272812952e04d5c3a1 (patch)
tree06e05c4c121abce92f5759eaa7d9baa87a25d496 /sound/soc/samsung/s3c2412-i2s.c
parentMerge remote-tracking branch 'asoc/topic/simple' into asoc-next (diff)
parentASoC: imx-ssi: Add .xlate_tdm_slot_mask() support. (diff)
parentASoC: tegra: move AC97 clock handling to the machine driver (diff)
downloadlinux-c159a85013afbb8283f0c7272812952e04d5c3a1.tar.xz
linux-c159a85013afbb8283f0c7272812952e04d5c3a1.zip
Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next