diff options
author | Mark Brown <broonie@kernel.org> | 2018-01-05 12:43:53 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-05 12:43:53 +0000 |
commit | 3116e748a652d1108419b8feb63ea63d0344a415 (patch) | |
tree | a88bcdd9ee2e2db4fbd1eacb1ce5e0587f034962 /sound/soc/codecs/nau8825.c | |
parent | 87c90ac06a60388d0dde17149c0b761554258792 (diff) | |
parent | 33953d851d37f8b62b96d70fdccd35b62dffebe8 (diff) | |
parent | 42e193cdcb9e197e788638bd33bab3d1905815f6 (diff) | |
parent | d6e2c4ffdf67de68e0263630525d2b521132d66a (diff) | |
parent | 7f12a56367bf526afde7e81820a8c7d97e75ed10 (diff) | |
parent | fe83b1b7d7d0ff11210f84f25b8e1ba1afbac76f (diff) |
Merge remote-tracking branches 'asoc/topic/mc13783', 'asoc/topic/msm8916', 'asoc/topic/mt8173', 'asoc/topic/mtk' and 'asoc/topic/nau8540' into asoc-next