diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-08-05 18:12:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-05 18:12:39 +0100 |
| commit | 6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2 (patch) | |
| tree | 92a6b7232a02ed69b86219e8f125e08bf95f3837 /include/linux | |
| parent | ASoC: Add PCM1792A spi mode codec support (diff) | |
| parent | ASoC: Add PCM1681 codec driver. (diff) | |
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
Trivial add/add conflicts:
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions