diff options
author | Mark Brown <broonie@kernel.org> | 2017-04-30 16:16:18 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-04-30 16:16:18 +0300 |
commit | 757fc30a1a9711ac00d958d4c3386dd904bc1295 (patch) | |
tree | 9a60871f8eb8eb89c0040bda7ff8e3ec0ccdaa14 /sound/oss/sb_ess.c | |
parent | ccf9fc86d63cbb5c46e96748f1937ce528f49ad2 (diff) | |
parent | c869ce5aaf8f470c8cf32638e7cd498f57118fa5 (diff) | |
parent | 2261cf1ce63ff1ca01772542a41b57eaac286841 (diff) | |
parent | 943b73112dfdd6747871a3347f70de6876f4dd4b (diff) | |
parent | 97c52eb969718f0231f197937eb0418e7514aba3 (diff) | |
download | linux-757fc30a1a9711ac00d958d4c3386dd904bc1295.tar.xz |
Merge remote-tracking branches 'asoc/topic/nau8824', 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next