Merge branch 'asoc-4.19' into asoc-next
[muen/linux.git] / MAINTAINERS
index 7cebd5bba8a8eb15305966228440f77174744a97..cb044950be72c93c216af443723120486c83dfe7 100644 (file)
@@ -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