Merge git://git.denx.de/u-boot-dm

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

diff --git a/doc/git-mailrc b/doc/git-mailrc
index b78e194ea89893560eb515a0f067f9b1311cdfd3..5a365cddd92887d1c1a00db915cc18f49104c979 100644 (file)
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -19,6 +19,7 @@ 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]>
@@ -30,7 +31,7 @@ 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 <l.majewski@samsung.com>
+alias lukma          Lukasz Majewski <l.majewski@denx.de>
 alias macpaul        Macpaul Lin <[email protected]>
 alias marex          Marek Vasut <[email protected]>
 alias masahiro       Masahiro Yamada <[email protected]>
@@ -38,8 +39,8 @@ alias mateusz        Mateusz Kulikowski <[email protected]>
 alias maxime        Maxime Ripard <[email protected]>
 alias monstr         Michal Simek <[email protected]>
 alias prafulla       Prafulla Wadaskar <[email protected]>
-alias bobenstein     Przemyslaw Marczak <[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]>
@@ -53,7 +54,7 @@ alias vapier         Mike Frysinger <[email protected]>
 alias wd             Wolfgang Denk <[email protected]>
 
 # Architecture aliases
-alias arch           arc, arm, avr32, bfin, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, sparc, x86
+alias arch           arc, arm, bfin, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, sparc, x86
 alias arches         arch
 
 alias arc            uboot, abrodkin
@@ -70,15 +71,14 @@ alias s3c            samsung
 alias s5pc           samsung
 alias samsung        uboot, prom
 alias snapdragon     uboot, mateusz
-alias socfpga        uboot, marex, Dinh Nguyen <[email protected]>
+alias socfpga        uboot, marex, dinh
 alias sunxi          uboot, jagan, maxime
 alias tegra          uboot, sjg, Tom Warren <[email protected]>, Stephen Warren <[email protected]>
 alias tegra2         tegra
 alias ti             uboot, trini
 alias uniphier       uboot, masahiro
 alias zynq           uboot, monstr
-alias rockchip       uboot, sjg, Lin huang <[email protected]>
-alias avr32          uboot, abiessmann
+alias rockchip       uboot, sjg, Kever Yang <[email protected]>, ptomsich
 
 alias bfin           uboot, vapier, sonic
 alias blackfin       bfin
@@ -133,7 +133,8 @@ alias spi            uboot, jagan
 alias spmi           uboot, mateusz
 alias ubi            uboot, hs
 alias usb            uboot, marex
+alias xhci           uboot, bmeng
 alias video          uboot, ag
 alias patman         uboot, sjg
 alias buildman       uboot, sjg
-alias pmic           uboot, bobenstein
+alias pmic           uboot, jaehoon