diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-26 11:16:06 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-26 11:16:06 +0900 |
| commit | 8707344edd833738bfdde8ed21bd1a0fd5418015 (patch) | |
| tree | 090a897a71ec54ddfaa9b2a880bf9f50a5561f89 /sound | |
| parent | f72362e6b7522040c16a224d5dcf2022e5468803 (diff) | |
| parent | 43ac946922b337507c4131c45bf339ddcd7e7402 (diff) | |
| parent | 6abca1d71b62090821240ee2a4507c94ddd144e9 (diff) | |
| download | blackbird-op-linux-8707344edd833738bfdde8ed21bd1a0fd5418015.tar.gz blackbird-op-linux-8707344edd833738bfdde8ed21bd1a0fd5418015.zip | |
Merge remote-tracking branches 'asoc/topic/imx' and 'asoc/topic/intel' into asoc-next
