diff options
author | Mark Brown <broonie@kernel.org> | 2018-03-28 10:31:58 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-03-28 10:31:58 +0800 |
commit | 38a72a9f86302e60c2b54fe00ea1700767434f6f (patch) | |
tree | 3e28bc97b98a7d41121d8609a83667fb81ad3abc /sound | |
parent | a1c83f69def14206f23c150a324190aa50c3ac27 (diff) | |
parent | 2822e66bb812489aff9c41f4b265fcc2d8613989 (diff) | |
parent | 60edb2006030894a4e45c84b04369cb70939d695 (diff) | |
parent | 91cd00083d734258bf293dcf76793e2348be391a (diff) | |
parent | 61fc060c40e6b92350c08a210619fc7d93c61e42 (diff) | |
download | linux-38a72a9f86302e60c2b54fe00ea1700767434f6f.tar.gz linux-38a72a9f86302e60c2b54fe00ea1700767434f6f.tar.xz |
Merge remote-tracking branches 'asoc/topic/wm9090', 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/wm_adsp' into asoc-next