Merge tag 'sound-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[muen/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8ebb000a2fbf462482c5e33696ed0133162d8b19..cfae882e63df0afba8dde963d9cf545b9207d388 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7082,14 +7082,13 @@ L:      linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     drivers/video/fbdev/i810/
 
-INTEL ASoC BDW/HSW DRIVERS
+INTEL ASoC DRIVERS
+M:     Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+M:     Liam Girdwood <liam.r.girdwood@linux.intel.com>
 M:     Jie Yang <yang.jie@linux.intel.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
-F:     sound/soc/intel/common/sst-dsp*
-F:     sound/soc/intel/common/sst-firmware.c
-F:     sound/soc/intel/boards/broadwell.c
-F:     sound/soc/intel/haswell/
+F:     sound/soc/intel/
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:     Intel SCU Linux support <intel-linux-scu@intel.com>
@@ -15542,6 +15541,13 @@ S:     Supported
 F:     arch/x86/xen/*swiotlb*
 F:     drivers/xen/*swiotlb*
 
+XEN SOUND FRONTEND DRIVER
+M:     Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Supported
+F:     sound/xen/*
+
 XFS FILESYSTEM
 M:     Darrick J. Wong <darrick.wong@oracle.com>
 M:     linux-xfs@vger.kernel.org