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

[karo-tx-uboot.git] / doc / git-mailrc

diff --git a/doc/git-mailrc b/doc/git-mailrc
index e3a47c46f34c545e5bfe3856b2ffb6334501527e..2cacaa034145fe8f0311c641a78a548dba0e4584 100644 (file)
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -22,8 +22,9 @@ alias jasonjin       Jason Jin <jason.jin@freescale.com>
 alias jhersh         Joe Hershberger <joe.hershberger@gmail.com>
 alias kimphill       Kim Phillips <kim.phillips@freescale.com>
 alias macpaul        Macpaul Lin <macpaul@andestech.com>
-alias marex          Marek Vasut <marek.vasut@gmail.com>
+alias marex          Marek Vasut <marex@denx.de>
 alias monstr         Michal Simek <monstr@monstr.eu>
+alias panto          Pantelis Antoniou <panto@antoniou-consulting.com>
 alias prafulla       Prafulla Wadaskar <prafulla@marvell.com>
 alias prom           Minkyu Kang <mk7.kang@samsung.com>
 alias rbohmer        Remy Bohmer <linux@bohmer.net>
@@ -102,7 +103,7 @@ alias cfi            uboot, stroese
 alias kerneldoc      uboot, marex
 alias fdt            uboot, Jerry Van Baren <vanbaren@cideas.com>
 alias i2c            uboot, hs
-alias mmc            uboot, afleming
+alias mmc            uboot, panto
 alias nand           uboot, scottwood
 alias net            uboot, jhersh
 alias usb            uboot, marex