diff options
author | Mark Brown <broonie@kernel.org> | 2019-02-06 18:31:39 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-02-06 18:31:39 +0100 |
commit | e29fe437ea5d926ea23d806b2468bf60ee8dc08a (patch) | |
tree | 958f74204fc7b15fb7a572c356bc15ac7384be01 /MAINTAINERS | |
parent | ASoC: ssm2602: switch to SPDX identifier (diff) | |
parent | ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables (diff) | |
download | linux-e29fe437ea5d926ea23d806b2468bf60ee8dc08a.tar.xz linux-e29fe437ea5d926ea23d806b2468bf60ee8dc08a.zip |
Merge branch 'asoc-5.0' into asoc-5.1 for dapm table
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9d846fb07442..56fbeca185cb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6154,7 +6154,7 @@ FREESCALE SOC SOUND DRIVERS M: Timur Tabi <timur@kernel.org> M: Nicolin Chen <nicoleotsuka@gmail.com> M: Xiubo Li <Xiubo.Lee@gmail.com> -R: Fabio Estevam <fabio.estevam@nxp.com> +R: Fabio Estevam <festevam@gmail.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: linuxppc-dev@lists.ozlabs.org S: Maintained @@ -10901,7 +10901,7 @@ F: include/linux/nvmem-consumer.h F: include/linux/nvmem-provider.h NXP SGTL5000 DRIVER -M: Fabio Estevam <fabio.estevam@nxp.com> +M: Fabio Estevam <festevam@gmail.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/sgtl5000.txt |