# Maintainer aliases. Use the same alias here as patchwork to keep
# things simple and easy to look up/coordinate.
-alias jhersh Joe Hershberger <joe.hershberger@gmail.com>
+alias jhersh Joe Hershberger <joe.hershberger@ni.com>
-alias trini Tom Rini <trini@ti.com>
+alias trini Tom Rini <trini@konsulko.com>
# Architecture aliases
-alias arch arm, avr32, bfin, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, sparc, x86
+alias arch arc, arm, avr32, bfin, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, sparc, x86
alias arches arch
+alias arc uboot, abrodkin
+
alias arm uboot, aaribaud
alias at91 uboot, abiessmann
alias davinci ti
alias s3c samsung
alias s5pc samsung
alias samsung uboot, prom
-alias sunxi uboot, ijc, jwrdegoede
+alias snapdragon uboot, mateusz
+alias socfpga uboot, marex, dinh
+alias sunxi uboot, jagan, maxime
alias tegra2 tegra
alias ti uboot, trini
alias uniphier uboot, masahiro
alias zynq uboot, monstr
-
alias avr32 uboot, abiessmann
alias bfin uboot, vapier, sonic
alias mpc85xx uboot, afleming, galak
alias mpc86xx uboot, afleming, galak
alias ppc4xx uboot, stroese
-alias ppc7xx uboot, wd
-alias ppc74xx uboot, wd
alias sandbox sjg
alias sb sandbox
alias superh uboot, iwamatsu
alias sh superh
-alias x86 uboot, sjg, gruss
+alias x86 uboot, sjg, bmeng
# Subsystem aliases
alias dm uboot, sjg
alias cfi uboot, stroese
alias dfu uboot, lukma
+alias eth uboot, jhersh
alias kerneldoc uboot, marex
alias fdt uboot, sjg
alias i2c uboot, hs
alias kconfig uboot, masahiro
-alias mmc uboot, panto
+alias mmc uboot, jaehoon
alias nand uboot, scottwood
alias net uboot, jhersh
+alias phy uboot, jhersh
alias spi uboot, jagan
+alias spmi uboot, mateusz
alias ubi uboot, hs
alias usb uboot, marex
alias video uboot, ag
alias patman uboot, sjg
alias buildman uboot, sjg
-alias pmic uboot, bobenstein
+alias pmic uboot, jaehoon