diff options
author | Mark Brown <broonie@kernel.org> | 2018-02-07 11:25:44 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-02-07 11:25:44 +0000 |
commit | 171248777a402f1d95b9f5d5928fe86514182224 (patch) | |
tree | 87b9ad19996d5d7484eb69c806b315d1ee11576d /include/sound | |
parent | 535b218a7fc7f2918d54fe00e6d7ac385ced3502 (diff) | |
parent | 180cad3c58ac435cc96f11b7f9d65b4886d62e30 (diff) | |
parent | dc2a17f4f074c434757e2cef5026d4747fe22955 (diff) | |
parent | 72c3818411e5418834472e3edadcf04cfacb1274 (diff) | |
parent | fde7f9dbc71365230eeb8c8ea97ce9b552c8e5bd (diff) | |
parent | edefc8f387a86c2db943db6accd1cd23be2b64a9 (diff) | |
download | linux-171248777a402f1d95b9f5d5928fe86514182224.tar.gz linux-171248777a402f1d95b9f5d5928fe86514182224.tar.bz2 linux-171248777a402f1d95b9f5d5928fe86514182224.zip |
Merge remote-tracking branches 'asoc/topic/max98373', 'asoc/topic/mtk', 'asoc/topic/pcm', 'asoc/topic/rockchip' and 'asoc/topic/sam9g20_wm8731' into asoc-next