diff options
author | Mark Brown <broonie@kernel.org> | 2018-03-28 10:29:40 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-03-28 10:29:40 +0800 |
commit | 165879a90b16b3e3a7ead59e5a082de01cd7af1a (patch) | |
tree | 6d257dd46ce6c916abb2935cf8ef5e9605529fab | |
parent | 323a56ed227da5ec584673f48fa1f342dbb16fee (diff) | |
parent | 0600b3e101b718557c1851c4a3ff456aa18e4956 (diff) | |
parent | 9c4f509a53cbcd968677c7f15c07260dd6c2276c (diff) | |
parent | cb3981b6a64e1353b4f8ee70f97583f59c9772d0 (diff) | |
parent | 2e78a5562ebc2e4bbdfd7f7729385b3acc94c36e (diff) | |
parent | 993709b83cb1276614974b25f130b8a73215e196 (diff) |
Merge remote-tracking branches 'asoc/topic/fsl_esai', 'asoc/topic/fsl_ssi', 'asoc/topic/fsl_utils', 'asoc/topic/generic-dmaengine' and 'asoc/topic/gtm601' into asoc-next