summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/fsi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-04 21:57:18 +0100
committerMark Brown <broonie@kernel.org>2015-02-04 21:57:18 +0100
commitcb6bfd3de48e285d74217f6e847135b9c81e92c0 (patch)
tree192065305ac6f9443741a881e2203753b59127c4 /sound/soc/sh/fsi.c
parentMerge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5645' and... (diff)
parentASoC: rx51: Correct DAPM route for capture (diff)
parentASoC: samsung: Replace depends on REGMAP_I2C with depends on I2C (diff)
parentASoC: sh: Remove unnecessary snd_pcm_lib_preallocate_free_for_all() (diff)
parentASoC: simple-card: Enable and disable DAI clocks as needed (diff)
parentASoC: sta32x: change dai name to be in line with the sta350 driver. (diff)
downloadlinux-cb6bfd3de48e285d74217f6e847135b9c81e92c0.tar.xz
linux-cb6bfd3de48e285d74217f6e847135b9c81e92c0.zip
Merge remote-tracking branches 'asoc/topic/rx51', 'asoc/topic/samsung', 'asoc/topic/sh', 'asoc/topic/simple' and 'asoc/topic/sta32x' into asoc-next