diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-11 13:54:36 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-11 13:54:36 +0000 |
| commit | 4aace4ce8d49e1ee46b9690a456752999e53fe92 (patch) | |
| tree | bfa918f32d4e1d77056d32cb08263f81f69215fa /sound/soc | |
| parent | d6c513e8b6d0d18b7f47dd555d36c048e6c9ee82 (diff) | |
| parent | d44c6114da8c9e83407397d06b5cd909a1cc9135 (diff) | |
| parent | f51e3d5372b4bf80006cdc1694a7656aba7c9b58 (diff) | |
Merge remote-tracking branches 'asoc/topic/fsl-asrc' and 'asoc/topic/fsl-ssi' into asoc-next