diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:53 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:53 +0200 |
commit | 440a5285589d4abc7f7c44f063a3554557820ab6 (patch) | |
tree | 171918c26e759c4d8efad31d1fe30d737a104318 /sound/soc/nuc900/Kconfig | |
parent | Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/max98095... (diff) | |
parent | ASoC: omap-pcm: Move omap-pcm under include/sound (diff) | |
parent | ASoC: rsnd: add rsnd_gen_dma_addr() for DMAC addr (diff) | |
download | linux-440a5285589d4abc7f7c44f063a3554557820ab6.tar.xz linux-440a5285589d4abc7f7c44f063a3554557820ab6.zip |
Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into asoc-next