diff options
author | Mark Brown <broonie@kernel.org> | 2018-02-07 11:25:47 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-02-07 11:25:47 +0000 |
commit | 3d0a352a552e6cdf052e8baf66f1fe6418c122fe (patch) | |
tree | 83a04e103585e26e35e25cfd3fb2ba1aed978979 /sound/soc/atmel | |
parent | 171248777a402f1d95b9f5d5928fe86514182224 (diff) | |
parent | 2efb8a8f11ba92971551189da91ece8b5040e461 (diff) | |
parent | da689e0da3c042c9d240e21189a2af0aa9da3ab5 (diff) | |
parent | eda85d1fee05d69e97939f9603b857f2244d72d9 (diff) |
Merge remote-tracking branches 'asoc/topic/sam9x5_wm8731', 'asoc/topic/sgtl5000' and 'asoc/topic/sun8i-codec' into asoc-next