summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-22 01:23:49 +0200
committerMark Brown <broonie@linaro.org>2014-05-22 01:23:49 +0200
commit0c5dacf2ca07a1b9a5970cd06cc5eab496860382 (patch)
tree7fcb6df82eab0738e8d0047ad6e234a2b8660801 /include/sound
parentMerge remote-tracking branches 'asoc/topic/ad1980', 'asoc/topic/adsp', 'asoc/... (diff)
parentASoC: cs42l56: bindings: sound: Add bindings for CS42L56 CODEC (diff)
parentASoC: cs42xx8: Do not use rtd->codec (diff)
parentASoC: davinci: add dependencies for SND_SOC_TLV320AIC3X (diff)
downloadlinux-0c5dacf2ca07a1b9a5970cd06cc5eab496860382.tar.xz
linux-0c5dacf2ca07a1b9a5970cd06cc5eab496860382.zip
Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc/topic/davinci' into asoc-next