Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/doc/git-mailrc b/doc/git-mailrc
index bc5a814925d3b36e8ec424f254724c1def5c7783..e3a47c46f34c545e5bfe3856b2ffb6334501527e 100644 (file)
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -11,6 +11,7 @@ alias u-boot uboot
 # Maintainer aliases.  Use the same alias here as patchwork to keep
 # things simple and easy to look up/coordinate.
 alias aaribaud       Albert Aribaud <albert.u.boot@aribaud.net>
 # Maintainer aliases.  Use the same alias here as patchwork to keep
 # things simple and easy to look up/coordinate.
 alias aaribaud       Albert Aribaud <albert.u.boot@aribaud.net>

+alias abiessmann     Andreas Bießmann <andreas.devel@googlemail.com>

 alias afleming       Andy Fleming <afleming@freescale.com>
 alias ag             Anatolij Gustschin <agust@denx.de>
 alias galak          Kumar Gala <galak@kernel.crashing.org>
 alias afleming       Andy Fleming <afleming@freescale.com>
 alias ag             Anatolij Gustschin <agust@denx.de>
 alias galak          Kumar Gala <galak@kernel.crashing.org>


@@ -18,6 +19,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 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>
 alias kimphill       Kim Phillips <kim.phillips@freescale.com>
 alias macpaul        Macpaul Lin <macpaul@andestech.com>
 alias marex          Marek Vasut <marek.vasut@gmail.com>


@@ -28,8 +30,11 @@ alias rbohmer        Remy Bohmer <linux@bohmer.net>
 alias reinhardm      Reinhard Meyer <u-boot@emk-elektronik.de>
 alias sbabic         Stefano Babic <sbabic@denx.de>
 alias scottwood      Scott Wood <scottwood@freescale.com>
 alias reinhardm      Reinhard Meyer <u-boot@emk-elektronik.de>
 alias sbabic         Stefano Babic <sbabic@denx.de>
 alias scottwood      Scott Wood <scottwood@freescale.com>

+alias sjg            Simon Glass <sjg@chromium.org>

 alias smcnutt        Scott McNutt <smcnutt@psyent.com>
 alias smcnutt        Scott McNutt <smcnutt@psyent.com>

+alias sonic          Sonic Zhang <sonic.adi@gmail.com>

 alias stroese        Stefan Roese <sr@denx.de>
 alias stroese        Stefan Roese <sr@denx.de>

+alias trini          Tom Rini <trini@ti.com>

 alias vapier         Mike Frysinger <vapier@gentoo.org>
 alias wd             Wolfgang Denk <wd@denx.de>
 
 alias vapier         Mike Frysinger <vapier@gentoo.org>
 alias wd             Wolfgang Denk <wd@denx.de>
 


@@ -38,22 +43,23 @@ alias arch           arm, avr32, bfin, m68k, microblaze, mips, nds32, nios2, pow
 alias arches         arch
 
 alias arm            uboot, aaribaud
 alias arches         arch
 
 alias arm            uboot, aaribaud

-alias at91           uboot, reinhardm
+alias at91           uboot, abiessmann

 alias davinci        ti
 alias imx            uboot, sbabic
 alias kirkwood       uboot, prafulla
 alias omap           ti
 alias pxa            uboot, marex
 alias davinci        ti
 alias imx            uboot, sbabic
 alias kirkwood       uboot, prafulla
 alias omap           ti
 alias pxa            uboot, marex

+alias rmobile        uboot, iwamatsu

 alias s3c            samsung
 alias s5pc           samsung
 alias samsung        uboot, prom
 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 tegra          uboot, sjg, Tom Warren <twarren@nvidia.com>, Stephen Warren <swarren@nvidia.com>

 alias tegra2         tegra
 alias tegra2         tegra

-alias ti             uboot, Sandeep Paulraj <s-paulraj@ti.com>, Tom Rini <trini@ti.com>
+alias ti             uboot, trini

 
 

-alias avr32          uboot, Andreas Bießmann <andreas.devel@googlemail.com>
+alias avr32          uboot, abiessmann

 
 

-alias bfin           uboot, vapier
+alias bfin           uboot, vapier, sonic

 alias blackfin       bfin
 
 alias m68k           uboot, jasonjin
 alias blackfin       bfin
 
 alias m68k           uboot, jasonjin


@@ -81,7 +87,7 @@ alias ppc4xx         uboot, stroese
 alias ppc7xx         uboot, wd
 alias ppc74xx        uboot, wd
 
 alias ppc7xx         uboot, wd
 alias ppc74xx        uboot, wd
 

-alias sandbox        Simon Glass <sjg@chromium.org>
+alias sandbox        sjg

 alias sb             sandbox
 
 alias sparc          uboot, Daniel Hellstrom <daniel@gaisler.com>
 alias sb             sandbox
 
 alias sparc          uboot, Daniel Hellstrom <daniel@gaisler.com>


@@ -89,14 +95,15 @@ alias sparc          uboot, Daniel Hellstrom <daniel@gaisler.com>
 alias superh         uboot, iwamatsu
 alias sh             superh
 
 alias superh         uboot, iwamatsu
 alias sh             superh
 

-alias x86            uboot, gruss
+alias x86            uboot, sjg, gruss

 
 # Subsystem aliases
 alias cfi            uboot, stroese
 
 # Subsystem aliases
 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 nand           uboot, scottwood
 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
 alias video          uboot, ag