From 2ada73ea1ae11b6a458e15f6c8666d957ded8ff0 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Thu, 10 Oct 2019 17:33:09 -0400
Subject: [PATCH] MAINTAINERS: Update ARM entry

Fully take over the ARM maintainers entry.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
 MAINTAINERS    | 2 +-
 doc/git-mailrc | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2ef2976855..bdc998a55e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -102,7 +102,7 @@ F:	doc/device-tree-bindings/mmc/snps,dw-mmc.txt
 F:	drivers/mmc/snps_dw_mmc.c
 
 ARM
-M:	Albert Aribaud <albert.u.boot@aribaud.net>
+M:	Tom Rini <trini@konsulko.com>
 S:	Maintained
 T:	git https://gitlab.denx.de/u-boot/custodians/u-boot-arm.git
 F:	arch/arm/
diff --git a/doc/git-mailrc b/doc/git-mailrc
index fdfec85928..d29416a57a 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -10,7 +10,6 @@ alias u-boot uboot
 
 # Maintainer aliases.  Use the same alias here as patchwork to keep
 # things simple and easy to look up/coordinate.
-alias aaribaud       Albert Aribaud <albert.u.boot@aribaud.net>
 alias abiessmann     Andreas Bießmann <andreas@biessmann.org>
 alias abrodkin       Alexey Brodkin <alexey.brodkin@synopsys.com>
 alias afleming       Andy Fleming <afleming@gmail.com>
@@ -55,7 +54,7 @@ alias arches         arch
 
 alias arc            uboot, abrodkin
 
-alias arm            uboot, aaribaud, trini
+alias arm            uboot, trini
 alias at91           uboot, abiessmann
 alias davinci        ti
 alias imx            uboot, sbabic