diff options
| author | Stefano Babic <[email protected]> | 2014-07-16 08:51:30 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2014-07-16 08:51:30 +0200 |
| commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f (patch) | |
| tree | c6378034591210b3142ca3add806d52c6ea22b3b /doc/git-mailrc | |
| parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 (diff) | |
| parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <[email protected]>
Conflicts:
boards.cfg
Diffstat (limited to 'doc/git-mailrc')
| -rw-r--r-- | doc/git-mailrc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/git-mailrc b/doc/git-mailrc index e53c888351f..ae7e7bfb5bb 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -17,10 +17,12 @@ alias ag Anatolij Gustschin <[email protected]> alias galak Kumar Gala <[email protected]> alias gruss Graeme Russ <[email protected]> alias hs Heiko Schocher <[email protected]> +alias ijc Ian Campbell <[email protected]> alias iwamatsu Nobuhiro Iwamatsu <[email protected]> alias jagan Jagannadha Sutradharudu Teki <[email protected]> alias jasonjin Jason Jin <[email protected]> alias jhersh Joe Hershberger <[email protected]> +alias jwrdegoede Hans de Goede <[email protected]> alias kimphill Kim Phillips <[email protected]> alias lukma Lukasz Majewski <[email protected]> alias macpaul Macpaul Lin <[email protected]> @@ -56,9 +58,11 @@ alias rmobile uboot, iwamatsu alias s3c samsung alias s5pc samsung alias samsung uboot, prom +alias sunxi uboot, ijc, jwrdegoede alias tegra uboot, sjg, Tom Warren <[email protected]>, Stephen Warren <[email protected]> alias tegra2 tegra alias ti uboot, trini +alias zynq uboot, monstr alias avr32 uboot, abiessmann |