diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:55 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:55 +0100 |
commit | 9919badff1ae85ecb273491b9f8adff0bb47b0e7 (patch) | |
tree | 2f7f5266e06fa64752a2f5c4da01407ef4a2bd9d /sound/soc/codecs/cs4265.c | |
parent | 1e9ca6857cee968f2af3a7be09418dfe27e81dce (diff) | |
parent | 98c5d36240e10c2e0e06e2bb10496291626d1d43 (diff) | |
parent | 5c216cc3f37a6eecb4e12ab0248b66e6386da0fe (diff) | |
parent | a4f87cea72d78f80c0bda1b4d8a821278eb1e4e2 (diff) | |
parent | cd9241e44af3d49977c39ddadbefbb719e2a4baf (diff) |
Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs42l52', 'asoc/topic/cs42l56' and 'asoc/topic/da732x' into asoc-next