diff options
| author | Stefano Babic <[email protected]> | 2013-09-13 12:04:54 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2013-09-13 12:10:07 +0200 |
| commit | c4a7ece02046f647019cc0aaddf530833a8db29c (patch) | |
| tree | 06342cd9b8cc41b95442a992fb38a1bc8671b05c /doc/git-mailrc | |
| parent | b5e7f1bc4b899ea34e838d5d60b3e6f8e479d0a9 (diff) | |
| parent | 8386ca8bea7a6a8469c3b6a99313afb642e6cbeb (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
MAINTAINERS
boards.cfg
Signed-off-by: Stefano Babic <[email protected]>
Diffstat (limited to 'doc/git-mailrc')
| -rw-r--r-- | doc/git-mailrc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/git-mailrc b/doc/git-mailrc index e3a47c46f34..2cacaa03414 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -22,8 +22,9 @@ alias jasonjin Jason Jin <[email protected]> alias jhersh Joe Hershberger <[email protected]> alias kimphill Kim Phillips <[email protected]> alias macpaul Macpaul Lin <[email protected]> -alias marex Marek Vasut <[email protected]> +alias marex Marek Vasut <[email protected]> alias monstr Michal Simek <[email protected]> +alias panto Pantelis Antoniou <[email protected]> alias prafulla Prafulla Wadaskar <[email protected]> alias prom Minkyu Kang <[email protected]> alias rbohmer Remy Bohmer <[email protected]> @@ -102,7 +103,7 @@ alias cfi uboot, stroese alias kerneldoc uboot, marex alias fdt uboot, Jerry Van Baren <[email protected]> alias i2c uboot, hs -alias mmc uboot, afleming +alias mmc uboot, panto alias nand uboot, scottwood alias net uboot, jhersh alias usb uboot, marex |