diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
| commit | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (patch) | |
| tree | 67c98488983a71305e24940930d6e27a96d54db2 /MAINTAINERS | |
| parent | 6c084839877666d987ff8bc4e0facd3c02d99d61 (diff) | |
| parent | f2cf0ef7c0ce141bb38f315c34c56e6ef5667a27 (diff) | |
Merge branch 'asoc-4.19' into asoc-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7cebd5bba8a8..cb044950be72 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13575,6 +13575,13 @@ L: linux-block@vger.kernel.org S: Maintained F: drivers/block/skd*[ch] +STI AUDIO (ASoC) DRIVERS +M: Arnaud Pouliquen <arnaud.pouliquen@st.com> +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt +F: sound/soc/sti/ + STI CEC DRIVER M: Benjamin Gaignard <benjamin.gaignard@linaro.org> S: Maintained @@ -13588,6 +13595,14 @@ T: git git://linuxtv.org/media_tree.git S: Maintained F: drivers/media/usb/stk1160/ +STM32 AUDIO (ASoC) DRIVERS +M: Olivier Moysan <olivier.moysan@st.com> +M: Arnaud Pouliquen <arnaud.pouliquen@st.com> +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/sound/st,stm32-*.txt +F: sound/soc/stm/ + STM32 TIMER/LPTIMER DRIVERS M: Fabrice Gasnier <fabrice.gasnier@st.com> S: Maintained |