env: delete selected vars not present in imported env

[u-boot] / doc / git-mailrc

diff --git a/doc/git-mailrc b/doc/git-mailrc
index 4039e55f5c0d116bafeb4f13e764af6700eee437..c8a6390e1dc7a4b0f1a0dc1b9925cfa56affbb07 100644 (file)
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -18,6 +18,7 @@ alias gruss          Graeme Russ <graeme.russ@gmail.com>
 alias hs             Heiko Schocher <hs@denx.de>
 alias iwamatsu       Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 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>
@@ -39,18 +40,19 @@ alias arches         arch
 
 alias arm            uboot, aaribaud
 alias at91           uboot, reinhardm
-alias davinci        omap
+alias davinci        ti
 alias imx            uboot, sbabic
 alias kirkwood       uboot, prafulla
-alias omap           uboot, Sandeep Paulraj <s-paulraj@ti.com>
+alias omap           ti
 alias pxa            uboot, marex
 alias s3c            samsung
 alias s5pc           samsung
 alias samsung        uboot, prom
 alias tegra          uboot, Simon Glass <sjg@chromium.org>, Tom Warren <twarren@nvidia.com>, Stephen Warren <swarren@nvidia.com>
 alias tegra2         tegra
+alias ti             uboot, Sandeep Paulraj <s-paulraj@ti.com>, Tom Rini <trini@ti.com>
 
-alias avr32          uboot, reinhardm
+alias avr32          uboot, Andreas Bießmann <andreas.devel@googlemail.com>
 
 alias bfin           uboot, vapier
 alias blackfin       bfin
@@ -96,6 +98,6 @@ alias fdt            uboot, Jerry Van Baren <vanbaren@cideas.com>
 alias i2c            uboot, hs
 alias mmc            uboot, afleming
 alias nand           uboot, scottwood
-alias net            uboot, wd
-alias usb            uboot, rbohmer
+alias net            uboot, jhersh
+alias usb            uboot, marex
 alias video          uboot, ag