diff options
author | Mark Brown <broonie@kernel.org> | 2018-01-18 11:55:56 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-18 11:55:56 +0000 |
commit | 0e987921bbcf6a46981dce9b9a17cfe265853992 (patch) | |
tree | d9fa9de9fcc0425dc8e6fcb7b0546dcae17a33ee | |
parent | 262db3bea59f5277722ae00d3a86c4230cf7af2b (diff) | |
parent | 845f80cb401c2ff6b9b8d75ebfc04b83b70268ef (diff) | |
parent | a5a86a7f87d7b684f0369e1f207bb294cfa58dde (diff) | |
parent | d1b726a9018e3f684ce190a1cbe012cb64f363d8 (diff) | |
parent | 5fb6e0a1a933cfe13200ae0ae7589263236fa108 (diff) | |
download | linux-0e987921bbcf6a46981dce9b9a17cfe265853992.tar.gz linux-0e987921bbcf6a46981dce9b9a17cfe265853992.tar.bz2 linux-0e987921bbcf6a46981dce9b9a17cfe265853992.zip |
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic/fsl_asrc' and 'asoc/topic/hdac_hdmi' into asoc-next