diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:09 +0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:17:09 +0700 |
commit | ab96d9d60367d614818692cfb8903f2afcfef214 (patch) | |
tree | d1cf1a45919f319e79d57b3eec93c95e0700be2d /sound | |
parent | 6fee37df0212f61b9abcc7805d7879fa2c9096d9 (diff) | |
parent | 512feb4e19a262ea0dfd7209506a998897feaadc (diff) | |
parent | 6139b1b184d5f6257f692dc814dbcd47e4cf90f1 (diff) | |
parent | 391005e8e3cd5bb641dff5abb1ad37254602cd7e (diff) | |
parent | 90966391005e69a8964350278917a87fe49adf0f (diff) |
Merge remote-tracking branches 'asoc/topic/fsl-sai', 'asoc/topic/fsl-ssl', 'asoc/topic/hdac' and 'asoc/topic/max9867' into asoc-next