aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorGravatar Mark Brown <broonie@kernel.org> 2014-10-06 12:48:50 +0100
committerGravatar Mark Brown <broonie@kernel.org> 2014-10-06 12:48:50 +0100
commit832a94143c549bc750350c4e770f1f604e6aaffb (patch)
tree72904df357465a61714b0cc7391dac8b2997d586 /sound
parentMerge tag 'asoc-v3.17-rc4' into asoc-linus (diff)
parentASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is (diff)
parentASoC: max98090: Enable both DMIC channels also when using mono configuration (diff)
downloadlinux-832a94143c549bc750350c4e770f1f604e6aaffb.tar.gz
linux-832a94143c549bc750350c4e770f1f604e6aaffb.tar.bz2
linux-832a94143c549bc750350c4e770f1f604e6aaffb.zip
Merge remote-tracking branches 'asoc/fix/davinci' and 'asoc/fix/max98090' into asoc-linus