summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 20:49:20 +0200
committerMark Brown <broonie@kernel.org>2015-04-12 20:49:20 +0200
commitff096eae2ef7d5f1c62a340a4b670912c2df5b98 (patch)
tree2dcf70e9536ca73c564c92a35e122e29e15bf5c6 /sound/soc/omap/omap-pcm.c
parentMerge remote-tracking branches 'asoc/topic/rt5641', 'asoc/topic/rt5677' and '... (diff)
parentASoC: tegra_wm9712: Use card DAPM context to access widgets (diff)
parentASoC: tlv320aic23: remove incorrect __exit markups (diff)
parentASoC: mop500_ab8500: Use card DAPM context to access widgets (diff)
downloadlinux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.tar.xz
linux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.zip
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' and 'asoc/topic/ux500' into asoc-next