diff options
| author | Tom Rini | 2019-04-14 00:03:06 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-04-14 00:03:06 -0400 |
| commit | 216800acf1fbf9f498455bf3c92d4513d9a4c681 (patch) | |
| tree | 08ee65c9c73a954c71b6f6051725338f0f23fdcb /doc/git-mailrc | |
| parent | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (diff) | |
| parent | 59aea29a31869ed0fd5ffc4b95050db966fcaf6d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Conflicts:
arch/arm/dts/armada-385-amc.dts
arch/arm/dts/armada-xp-theadorable.dts
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'doc/git-mailrc')
| -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 ec6d8bf8f4f..f989792e8d3 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -24,7 +24,7 @@ alias dinh Dinh Nguyen <dinguyen@kernel.org> alias hs Heiko Schocher <hs@denx.de> alias iwamatsu Nobuhiro Iwamatsu <iwamatsu@nigauri.org> alias jaehoon Jaehoon Chung <jh80.chung@samsung.com> -alias jagan Jagan Teki <jagan@openedev.com> +alias jagan Jagan Teki <jagan@amarulasolutions.com> alias jhersh Joe Hershberger <joe.hershberger@ni.com> alias lukma Lukasz Majewski <lukma@denx.de> alias macpaul Macpaul Lin <macpaul@andestech.com> |