summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-06-05 15:25:41 +0100
committerMark Brown <broonie@kernel.org>2018-06-05 15:25:41 +0100
commitaac521e880f221e6d4e67b7061022dbecace0df0 (patch)
treefca79e92df04b0b433d2c665dc5baf56e603ac25 /MAINTAINERS
parentff2faf1289c1f81b5b26b9451dd1c2006aac8db8 (diff)
parentc90ddb69d4b24bc32edf9c7bcfec85e52427d1c1 (diff)
downloadblackbird-op-linux-aac521e880f221e6d4e67b7061022dbecace0df0.tar.gz
blackbird-op-linux-aac521e880f221e6d4e67b7061022dbecace0df0.zip
Merge branch 'asoc-4.17' into asoc-4.18 merge window
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index eaee45919cb9..1eed0f5edd86 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7023,14 +7023,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>
OpenPOWER on IntegriCloud