diff options
author | Mark Brown <broonie@kernel.org> | 2018-03-28 10:29:46 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-03-28 10:29:46 +0800 |
commit | 89314dbf6188f59feb43b904b73fff95d5bb2cd8 (patch) | |
tree | ebd245c35e115a2f81e88e4a79fe23085add691c /sound | |
parent | 165879a90b16b3e3a7ead59e5a082de01cd7af1a (diff) | |
parent | 38e8899b3fff1f927d8c621795ba1d9980013f4c (diff) | |
parent | 7c8d90592165601fc7f133e72f06d7348d476579 (diff) | |
parent | 790d631dcfec6b073b04bb6809bce4c09baf198a (diff) | |
parent | 40aa60a2e9ab5242593101bb6270563ee5acdf46 (diff) |
Merge remote-tracking branches 'asoc/topic/hdmi-codec', 'asoc/topic/ics43432', 'asoc/topic/imx-wm8962' and 'asoc/topic/inno_rk3036' into asoc-next