diff options
| author | Mark Brown | 2017-09-01 12:12:55 +0100 |
|---|---|---|
| committer | Mark Brown | 2017-09-01 12:12:55 +0100 |
| commit | e5fadb7281ed7c86d0d2ad394588ac3eda99b019 (patch) | |
| tree | ce607d213aa7b1daf102aee029b3d81b2a314179 | |
| parent | bf3cc310a23defb31e23c3f062b335178c8a603f (diff) | |
| parent | fcf005a645e6855d68f98b9455f6b47ac2ed161c (diff) | |
| parent | 1fe165b7e9c3e1b1cfa98310979db0814c7445ea (diff) | |
| parent | 60b0fdeac19945107b956a8a2a0ba3a14827db60 (diff) | |
| parent | eb33869c720656c16e614ea40a175a014f60007b (diff) | |
Merge remote-tracking branches 'asoc/topic/rk3036', 'asoc/topic/rockchip', 'asoc/topic/rt274' and 'asoc/topic/rt5514' into asoc-next