diff options
author | Mark Brown <broonie@kernel.org> | 2018-01-05 12:43:47 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-05 12:43:47 +0000 |
commit | 2f1eceda4d86c3157330292b68b1bc6c5df4e715 (patch) | |
tree | dfdb743351e29bc0aa6c299c4c736daed51aba44 /include/uapi/sound | |
parent | 747c9084272f8cc9d445d026fbc889c099c4a3a2 (diff) | |
parent | 845f80cb401c2ff6b9b8d75ebfc04b83b70268ef (diff) | |
parent | 52eee84e815e0fbaf9ada848ab5646314a529b61 (diff) | |
parent | d1b726a9018e3f684ce190a1cbe012cb64f363d8 (diff) | |
parent | 5fb6e0a1a933cfe13200ae0ae7589263236fa108 (diff) | |
download | linux-2f1eceda4d86c3157330292b68b1bc6c5df4e715.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic/fsl_asrc' and 'asoc/topic/hdac_hdmi' into asoc-next