Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / doc / git-mailrc

diff --git a/doc/git-mailrc b/doc/git-mailrc
index bf8f2a5b69a9e084075f53f680b15e384b744595..b75ebab02bab2ac934b2ace0f736631513aea623 100644 (file)
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -15,7 +15,7 @@ alias abiessmann     Andreas Bießmann <andreas@biessmann.org>
 alias abrodkin       Alexey Brodkin <alexey.brodkin@synopsys.com>
 alias afleming       Andy Fleming <afleming@gmail.com>
 alias ag             Anatolij Gustschin <agust@denx.de>
-alias agraf          Alexander Graf <agraf@suse.de>
+alias agraf          Alexander Graf <agraf@csgraf.de>
 alias alisonwang     Alison Wang <alison.wang@nxp.com>
 alias angelo_ts      Angelo Dureghello <angelo@sysam.it>
 alias bmeng          Bin Meng <bmeng.cn@gmail.com>
@@ -44,7 +44,7 @@ alias smcnutt        Scott McNutt <smcnutt@psyent.com>
 alias stroese        Stefan Roese <sr@denx.de>
 alias trini          Tom Rini <trini@konsulko.com>
 alias wd             Wolfgang Denk <wd@denx.de>
-alias yorksun        York Sun <york.sun@nxp.com>
+alias prabhu_kush    Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
 
 # Architecture aliases
 alias arch           arc, arm, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, x86
@@ -56,7 +56,7 @@ alias arm            uboot, aaribaud, trini
 alias at91           uboot, abiessmann
 alias davinci        ti
 alias imx            uboot, sbabic
-alias kirkwood       uboot, prafulla, luka
+alias kirkwood       uboot, prafulla, luka, stroese
 alias omap           ti
 alias pxa            uboot, marex
 alias rmobile        uboot, iwamatsu
@@ -86,12 +86,12 @@ alias nds32          uboot, macpaul
 alias nios           uboot, Thomas Chou <thomas@wytron.com.tw>, smcnutt
 alias nios2          nios
 
-alias powerpc        uboot, afleming, stroese, wd, yorksun, mariosix
+alias powerpc        uboot, afleming, stroese, wd, prabhu_kush, mariosix
 alias ppc            powerpc
 alias mpc8xx         uboot, wd, Christophe Leroy <christophe.leroy@c-s.fr>
-alias mpc83xx        uboot, yorksun, mariosix
-alias mpc85xx        uboot, afleming, yorksun
-alias mpc86xx        uboot, afleming, yorksun
+alias mpc83xx        uboot, mariosix
+alias mpc85xx        uboot, afleming, prabhu_kush
+alias mpc86xx        uboot, afleming, prabhu_kush
 
 alias sandbox        sjg
 alias sb             sandbox