summaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-13 00:04:42 +0100
committerMark Brown <broonie@linaro.org>2014-03-13 00:04:42 +0100
commit7cc6417208f12804db44635bbf5ccc4bfc54f5f2 (patch)
tree92194807ec67119ce7ca08ffa4e35ba30b54b10d /sound/soc/blackfin
parentMerge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/t... (diff)
parentMerge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentASoC: sgtl5000: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: migor: Convert to table based DAPM setup (diff)
parentASoC: simple-card: card name can be option (diff)
parentASoC: sirf: Add SiRF audio card (diff)
parentASoC: sn95031: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: ssm2602: Omit superfluous elements in input select array (diff)
parentASoC: stac9766: Use SOC_ENUM_{SINGLE|DOUBLE}_DECL() (diff)
downloadlinux-7cc6417208f12804db44635bbf5ccc4bfc54f5f2.tar.xz
linux-7cc6417208f12804db44635bbf5ccc4bfc54f5f2.zip
Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/sn95031', 'asoc/topic/ssm2602' and 'asoc/topic/stac9766' into asoc-next