MAINTAINERS: Update email of Neil Armstrong

My professional e-mail will change and the BayLibre one will
bounce after mid-september of 2022.

This updates the MAINTAINERS files and adds an entry in the
.mailmap file.

Signed-off-by: Neil Armstrong <[email protected]>

13 files changed, 13 insertions, 12 deletions

diff --git a/.mailmap b/.mailmap
index f27f366bcb5..8acce4b2bfe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -49,6 +49,7 @@ Michal Simek <[email protected]> <[email protected]>
 Michal Simek <[email protected]> <[email protected]>
 Michal Simek <[email protected]> <[email protected]>
 Michal Simek <[email protected]> <[email protected]>
+Neil Armstrong <[email protected]> <[email protected]>
 Nicolas Saenz Julienne <[email protected]> <[email protected]>
 Patrice Chotard <[email protected]> <[email protected]>
 Patrick Delaunay <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 5857fbf3986..36a2b69fcb9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -143,7 +143,7 @@ F:	arch/arm/mach-socfpga/
 F:	drivers/sysreset/sysreset_socfpga*
 
 ARM AMLOGIC SOC SUPPORT
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 T:	git https://source.denx.de/u-boot/custodians/u-boot-amlogic.git
diff --git a/board/amlogic/odroid-n2/MAINTAINERS b/board/amlogic/odroid-n2/MAINTAINERS
index 43724e6fdd9..23cc8e73b10 100644
--- a/board/amlogic/odroid-n2/MAINTAINERS
+++ b/board/amlogic/odroid-n2/MAINTAINERS
@@ -1,5 +1,5 @@
 ODROID-N2
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/odroid-n2/
diff --git a/board/amlogic/p200/MAINTAINERS b/board/amlogic/p200/MAINTAINERS
index 1df9b8b24be..33ca3df5c6a 100644
--- a/board/amlogic/p200/MAINTAINERS
+++ b/board/amlogic/p200/MAINTAINERS
@@ -1,6 +1,6 @@
 P200
 M:	Beniamino Galvani <[email protected]>
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/p200/
diff --git a/board/amlogic/p201/MAINTAINERS b/board/amlogic/p201/MAINTAINERS
index 1501b6280da..4549d01cad3 100644
--- a/board/amlogic/p201/MAINTAINERS
+++ b/board/amlogic/p201/MAINTAINERS
@@ -1,5 +1,5 @@
 P201
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/p201/
diff --git a/board/amlogic/p212/MAINTAINERS b/board/amlogic/p212/MAINTAINERS
index 3d622af29ba..b2e3205fdf0 100644
--- a/board/amlogic/p212/MAINTAINERS
+++ b/board/amlogic/p212/MAINTAINERS
@@ -1,5 +1,5 @@
 P212
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/p212/
diff --git a/board/amlogic/q200/MAINTAINERS b/board/amlogic/q200/MAINTAINERS
index ba7c12b2c1a..9c84cca27e8 100644
--- a/board/amlogic/q200/MAINTAINERS
+++ b/board/amlogic/q200/MAINTAINERS
@@ -1,5 +1,5 @@
 Q200
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/q200/
diff --git a/board/amlogic/s400/MAINTAINERS b/board/amlogic/s400/MAINTAINERS
index fb46b1bbbf7..ca51bb6b3ba 100644
--- a/board/amlogic/s400/MAINTAINERS
+++ b/board/amlogic/s400/MAINTAINERS
@@ -1,5 +1,5 @@
 S400
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/s400/
diff --git a/board/amlogic/sei510/MAINTAINERS b/board/amlogic/sei510/MAINTAINERS
index c01c1d60df4..c6039bc82e2 100644
--- a/board/amlogic/sei510/MAINTAINERS
+++ b/board/amlogic/sei510/MAINTAINERS
@@ -1,5 +1,5 @@
 SEI510
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/sei510/
diff --git a/board/amlogic/sei610/MAINTAINERS b/board/amlogic/sei610/MAINTAINERS
index 092178b2c83..799ad687f09 100644
--- a/board/amlogic/sei610/MAINTAINERS
+++ b/board/amlogic/sei610/MAINTAINERS
@@ -1,5 +1,5 @@
 SEI610
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/sei610/
diff --git a/board/amlogic/u200/MAINTAINERS b/board/amlogic/u200/MAINTAINERS
index a259d12886d..47cec234a1d 100644
--- a/board/amlogic/u200/MAINTAINERS
+++ b/board/amlogic/u200/MAINTAINERS
@@ -1,5 +1,5 @@
 U200
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/u200/
diff --git a/board/amlogic/vim3/MAINTAINERS b/board/amlogic/vim3/MAINTAINERS
index d8848495c71..c5f8d9cc5ce 100644
--- a/board/amlogic/vim3/MAINTAINERS
+++ b/board/amlogic/vim3/MAINTAINERS
@@ -1,5 +1,5 @@
 VIM3
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/vim3/
diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS
index 991590d9f25..96ccda20011 100644
--- a/board/amlogic/w400/MAINTAINERS
+++ b/board/amlogic/w400/MAINTAINERS
@@ -1,5 +1,5 @@
 W400
-M:	Neil Armstrong <[email protected]>
+M:	Neil Armstrong <[email protected]>
 S:	Maintained
 L:	[email protected]
 F:	board/amlogic/w400/