diff options
| author | Mark Brown <broonie@kernel.org> | 2017-02-08 18:35:11 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-02-08 18:35:11 +0000 |
| commit | 1f855958396247da40a560a6c44f333c2e3047c7 (patch) | |
| tree | c64e19b6e7e2755b6066d35a273e1db472d6c54b /sound | |
| parent | d218199d63a50d9ea61952a3c4222650ef0bea03 (diff) | |
| parent | bcb8c270829a639b8b838809d7c2b540e65f4e01 (diff) | |
| parent | ebad64d19377957976963f99ce1fcf2f09796357 (diff) | |
Merge remote-tracking branches 'asoc/fix/fsl-mxs-saif' and 'asoc/fix/sunxi' into asoc-linus