diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-27 17:29:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-27 17:29:18 +0000 |
| commit | 8e3bb8ec11ed60963dbb70e69cf1a6806489dce3 (patch) | |
| tree | 311171da6c49fd0aaa7812ca7962e257fd016383 /MAINTAINERS | |
| parent | 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e (diff) | |
| parent | f25e203070e5b12e4db366ee99b86f33a968f1ae (diff) | |
| download | linux-8e3bb8ec11ed60963dbb70e69cf1a6806489dce3.tar.bz2 | |
Merge branch 'asoc-5.6' into asoc-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cc1d18cb5d18..db0f6be56dd4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4021,8 +4021,8 @@ F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml F: sound/soc/codecs/cros_ec_codec.* CIRRUS LOGIC AUDIO CODEC DRIVERS -M: Brian Austin <brian.austin@cirrus.com> -M: Paul Handrigan <Paul.Handrigan@cirrus.com> +M: James Schulman <james.schulman@cirrus.com> +M: David Rhodes <david.rhodes@cirrus.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Maintained F: sound/soc/codecs/cs* @@ -15613,6 +15613,17 @@ F: sound/soc/ F: include/dt-bindings/sound/ F: include/sound/soc* +SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS +M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> +M: Liam Girdwood <lgirdwood@gmail.com> +M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> +M: Kai Vehmanen <kai.vehmanen@linux.intel.com> +M: Daniel Baluta <daniel.baluta@nxp.com> +L: sound-open-firmware@alsa-project.org (moderated for non-subscribers) +W: https://github.com/thesofproject/linux/ +S: Supported +F: sound/soc/sof/ + SOUNDWIRE SUBSYSTEM M: Vinod Koul <vkoul@kernel.org> M: Sanyog Kale <sanyog.r.kale@intel.com> |