diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-15 14:31:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-15 14:31:39 -0400 |
| commit | a74ef40a471d9d4bffb36a8c89744cf6fd631e6f (patch) | |
| tree | d0e7678f13d9cb3323df2a1c75fa5ef35106e006 /doc | |
| parent | 252ed8729d8a2571faacb6fdb3463df2361a733d (diff) | |
| parent | 6462cdedc20b08ff5aa402a991ec89b3255ba51d (diff) | |
| download | talos-obmc-uboot-a74ef40a471d9d4bffb36a8c89744cf6fd631e6f.tar.gz talos-obmc-uboot-a74ef40a471d9d4bffb36a8c89744cf6fd631e6f.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-mailrc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/git-mailrc b/doc/git-mailrc index 025c0b3cac..5f8438e891 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -31,7 +31,7 @@ alias luka Luka Perkov <luka.perkov@sartura.hr> alias lukma Lukasz Majewski <l.majewski@samsung.com> alias macpaul Macpaul Lin <macpaul@andestech.com> alias marex Marek Vasut <marex@denx.de> -alias masahiro Masahiro Yamada <yamada.m@jp.panasonic.com> +alias masahiro Masahiro Yamada <yamada.masahiro@socionext.com> alias monstr Michal Simek <monstr@monstr.eu> alias panto Pantelis Antoniou <panto@antoniou-consulting.com> alias prafulla Prafulla Wadaskar <prafulla@marvell.com> |
