| commit | 6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Aug 05 18:12:39 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Mon Aug 05 18:12:39 2013 +0100 |
| tree | 92a6b7232a02ed69b86219e8f125e08bf95f3837 | |
| parent | 13b02fa0dbb1311d08dfacd897a6ff41232d7cfb [diff] | |
| parent | 95169d080fcaad6c990ce3602d9b3d38753b1fa4 [diff] |
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm Trivial add/add conflicts: sound/soc/codecs/Kconfig sound/soc/codecs/Makefile