diff options
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | MAINTAINERS | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -41,7 +41,8 @@ Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com> Andrew Vasquez <andrew.vasquez@qlogic.com> Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com> Andy Adamson <andros@citi.umich.edu> -Antoine Tenart <antoine.tenart@free-electrons.com> +Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com> +Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com> Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com> Archit Taneja <archit@ti.com> Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 25e60fce7aeb..867157311dc8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1628,7 +1628,7 @@ N: meson ARM/Annapurna Labs ALPINE ARCHITECTURE M: Tsahee Zidenberg <tsahee@annapurnalabs.com> -M: Antoine Tenart <antoine.tenart@bootlin.com> +M: Antoine Tenart <atenart@kernel.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/boot/dts/alpine* @@ -8678,7 +8678,7 @@ F: drivers/input/input-mt.c K: \b(ABS|SYN)_MT_ INSIDE SECURE CRYPTO DRIVER -M: Antoine Tenart <antoine.tenart@bootlin.com> +M: Antoine Tenart <atenart@kernel.org> L: linux-crypto@vger.kernel.org S: Maintained F: drivers/crypto/inside-secure/ |