git-mailrc: Update some addresses and aliases

- Based on commit 08ae21af9671 ("MAINTAINERS: Switch nxp.com domain")
  update or drop some formerly Freescale addresses.
- Update a few aliases to reflect current custodians

Signed-off-by: Tom Rini <[email protected]>

1 files changed, 12 insertions, 27 deletions

diff --git a/doc/git-mailrc b/doc/git-mailrc
index e55a1cb1d9e..af8e3358a98 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -16,25 +16,21 @@ alias abrodkin       Alexey Brodkin <[email protected]>
 alias afleming       Andy Fleming <[email protected]>
 alias ag             Anatolij Gustschin <[email protected]>
 alias agraf          Alexander Graf <[email protected]>
-alias alisonwang     Alison Wang <[email protected]>
+alias alisonwang     Alison Wang <[email protected]>
 alias angelo_ts      Angelo Dureghello <[email protected]>
 alias bmeng          Bin Meng <[email protected]>
 alias danielschwierzeck Daniel Schwierzeck <[email protected]>
 alias dinh	     Dinh Nguyen <[email protected]>
-alias galak          Kumar Gala <[email protected]>
 alias hs             Heiko Schocher <[email protected]>
-alias ijc            Ian Campbell <[email protected]>
 alias iwamatsu       Nobuhiro Iwamatsu <[email protected]>
 alias jaehoon        Jaehoon Chung <[email protected]>
 alias jagan          Jagan Teki <[email protected]>
-alias jasonjin       Jason Jin <[email protected]>
 alias jhersh         Joe Hershberger <[email protected]>
-alias jwrdegoede     Hans de Goede <[email protected]>
-alias kimphill       Kim Phillips <[email protected]>
 alias luka           Luka Perkov <[email protected]>
 alias lukma          Lukasz Majewski <[email protected]>
 alias macpaul        Macpaul Lin <[email protected]>
 alias marex          Marek Vasut <[email protected]>
+alias mariosix       Mario Six <[email protected]>
 alias masahiro       Masahiro Yamada <[email protected]>
 alias mateusz        Mateusz Kulikowski <[email protected]>
 alias maxime	     Maxime Ripard <[email protected]>
@@ -42,25 +38,22 @@ alias monstr         Michal Simek <[email protected]>
 alias prafulla       Prafulla Wadaskar <[email protected]>
 alias prom           Minkyu Kang <[email protected]>
 alias ptomsich       Philipp Tomsich <[email protected]>
-alias rbohmer        Remy Bohmer <[email protected]>
-alias reinhardm      Reinhard Meyer <[email protected]>
 alias sbabic         Stefano Babic <[email protected]>
-alias scottwood      Scott Wood <[email protected]>
+alias scottwood      Scott Wood <[email protected]>
 alias sjg            Simon Glass <[email protected]>
 alias smcnutt        Scott McNutt <[email protected]>
-alias sonic          Sonic Zhang <[email protected]>
 alias stroese        Stefan Roese <[email protected]>
 alias trini          Tom Rini <[email protected]>
-alias vapier         Mike Frysinger <[email protected]>
 alias wd             Wolfgang Denk <[email protected]>
+alias yorksun        York Sun <[email protected]>
 
 # Architecture aliases
-alias arch           arc, arm, bfin, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, sparc, x86
+alias arch           arc, arm, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, x86
 alias arches         arch
 
 alias arc            uboot, abrodkin
 
-alias arm            uboot, aaribaud
+alias arm            uboot, aaribaud, trini
 alias at91           uboot, abiessmann
 alias davinci        ti
 alias imx            uboot, sbabic
@@ -81,9 +74,6 @@ alias uniphier       uboot, masahiro
 alias zynq           uboot, monstr
 alias rockchip       uboot, sjg, Kever Yang <[email protected]>, ptomsich
 
-alias bfin           uboot, vapier, sonic
-alias blackfin       bfin
-
 alias m68k           uboot, alisonwang, angelo_ts
 alias coldfire       m68k
 
@@ -97,22 +87,17 @@ alias nds32          uboot, macpaul
 alias nios           uboot, Thomas Chou <[email protected]>, smcnutt
 alias nios2          nios
 
-alias powerpc        uboot, afleming, kimphill, galak, stroese, wd
+alias powerpc        uboot, afleming, stroese, wd, yorksun, mariosix
 alias ppc            powerpc
-alias mpc5xxx        uboot, wd
-alias mpc8xx         uboot, wd
-alias mpc82xx        uboot, wd
-alias mpc83xx        uboot, kimphill
-alias mpc85xx        uboot, afleming, galak
-alias mpc86xx        uboot, afleming, galak
-alias ppc4xx         uboot, stroese
+alias mpc8xx         uboot, wd, Christophe Leroy <[email protected]>
+alias mpc83xx        uboot, yorksun, mariosix
+alias mpc85xx        uboot, afleming, yorksun
+alias mpc86xx        uboot, afleming, yorksun
 
 alias sandbox        sjg
 alias sb             sandbox
 
-alias sparc          uboot, Francois Retief <[email protected]>
-
-alias superh         uboot, iwamatsu
+alias superh         uboot, iwamatsu, marex
 alias sh             superh
 
 alias x86            uboot, sjg, bmeng