MAINTAINERS: update Ard's email address to @kernel.org

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/.mailmap b/.mailmap
index 83d7e750c2fc89e60986049ec475d93eb1f7bb8b..5d3b741a3f95e6dec10f75f67d3b40c20ab99c3a 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Andy Adamson <andros@citi.umich.edu>
 Antoine Tenart <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>
 Arnaud Patard <arnaud.patard@rtp-net.org>
 Arnd Bergmann <arnd@arndb.de>
 Axel Dyks <xl@xlsigned.net>

diff --git a/MAINTAINERS b/MAINTAINERS
index cba1095547fd720f7ca08b4d6fe0ec9c1a9a9807..cc9f02ab9316a34cfcb7fcad7c5a5de6740efd76 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6003,14 +6003,14 @@ F:      sound/usb/misc/ua101.c
 EFI TEST DRIVER
 L:     linux-efi@vger.kernel.org
 M:     Ivan Hu <ivan.hu@canonical.com>
-M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M:     Ard Biesheuvel <ardb@kernel.org>
 S:     Maintained
 F:     drivers/firmware/efi/test/
 
 EFI VARIABLE FILESYSTEM
 M:     Matthew Garrett <matthew.garrett@nebula.com>
 M:     Jeremy Kerr <jk@ozlabs.org>
-M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M:     Ard Biesheuvel <ardb@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 L:     linux-efi@vger.kernel.org
 S:     Maintained
@@ -6189,7 +6189,7 @@ S:        Supported
 F:     security/integrity/evm/
 
 EXTENSIBLE FIRMWARE INTERFACE (EFI)
-M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M:     Ard Biesheuvel <ardb@kernel.org>
 L:     linux-efi@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
 S:     Maintained
@@ -15006,7 +15006,7 @@ F:      include/media/soc_camera.h
 F:     drivers/staging/media/soc_camera/
 
 SOCIONEXT SYNQUACER I2C DRIVER
-M:     Ard Biesheuvel <ard.biesheuvel@linaro.org>
+M:     Ard Biesheuvel <ardb@kernel.org>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-synquacer.c