diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-22 11:24:28 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-22 11:24:28 +0200 |
commit | 95baa281a384b5312ef5884b408e7cc4187b00e6 (patch) | |
tree | ab92c42c8c3ded30f4ceaa88136fffa939da96de /sound/soc/atmel | |
parent | Merge remote-tracking branch 'asoc/topic/rt5670' into asoc-next (diff) | |
parent | ASoC: wm_adsp: Add basic debugfs entries (diff) | |
parent | ASoC: atmel: properly select dma driver state (diff) | |
download | linux-95baa281a384b5312ef5884b408e7cc4187b00e6.tar.xz linux-95baa281a384b5312ef5884b408e7cc4187b00e6.zip |
Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/atmel' into asoc-next