The following commit has been merged into the efi/core branch of tip: Commit-ID: 8b5c712f27044dc7812ceea5964eb2ea8952da78 Gitweb: https://git.kernel.org/tip/8b5c712f27044dc7812ceea5964eb2ea8952da78 Author: Ard Biesheuvel <ardb@xxxxxxxxxx> AuthorDate: Wed, 06 Nov 2019 15:41:32 +01:00 Committer: Ard Biesheuvel <ardb@xxxxxxxxxx> CommitterDate: Thu, 07 Nov 2019 10:18:45 +01:00 MAINTAINERS: update Ard's email address to @kernel.org Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxx> Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx> --- .mailmap | 1 + MAINTAINERS | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 83d7e75..5d3b741 100644 --- a/.mailmap +++ b/.mailmap @@ -32,6 +32,7 @@ Andy Adamson <andros@xxxxxxxxxxxxxx> Antoine Tenart <antoine.tenart@xxxxxxxxxxxxxxxxxx> Antonio Ospite <ao2@xxxxxx> <ao2@xxxxxxxxxxxxxxxxxxxx> Archit Taneja <archit@xxxxxx> +Ard Biesheuvel <ardb@xxxxxxxxxx> <ard.biesheuvel@xxxxxxxxxx> Arnaud Patard <arnaud.patard@xxxxxxxxxxx> Arnd Bergmann <arnd@xxxxxxxx> Axel Dyks <xl@xxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index cba1095..cc9f02a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6003,14 +6003,14 @@ F: sound/usb/misc/ua101.c EFI TEST DRIVER L: linux-efi@xxxxxxxxxxxxxxx M: Ivan Hu <ivan.hu@xxxxxxxxxxxxx> -M: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> +M: Ard Biesheuvel <ardb@xxxxxxxxxx> S: Maintained F: drivers/firmware/efi/test/ EFI VARIABLE FILESYSTEM M: Matthew Garrett <matthew.garrett@xxxxxxxxxx> M: Jeremy Kerr <jk@xxxxxxxxxx> -M: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> +M: Ard Biesheuvel <ardb@xxxxxxxxxx> T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git L: linux-efi@xxxxxxxxxxxxxxx S: Maintained @@ -6189,7 +6189,7 @@ S: Supported F: security/integrity/evm/ EXTENSIBLE FIRMWARE INTERFACE (EFI) -M: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> +M: Ard Biesheuvel <ardb@xxxxxxxxxx> L: linux-efi@xxxxxxxxxxxxxxx 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@xxxxxxxxxx> +M: Ard Biesheuvel <ardb@xxxxxxxxxx> L: linux-i2c@xxxxxxxxxxxxxxx S: Maintained F: drivers/i2c/busses/i2c-synquacer.c
|