diff options
| -rw-r--r-- | .mailmap | 6 | ||||
| -rw-r--r-- | contrib/gitdm/aliases | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -28,7 +28,11 @@ Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> # Corrupted Author fields +Aaron Larson <alarson@ddci.com> alarson@ddci.com +Andreas Färber <andreas.faerber@web.de> Andreas Färber <andreas.faerber> +Jason Wang <jasowang@redhat.com> Jason Wang <jasowang> Marek Dolata <mkdolata@us.ibm.com> mkdolata@us.ibm.com <mkdolata@us.ibm.com> +Michael Ellerman <mpe@ellerman.id.au> michael@ozlabs.org <michael@ozlabs.org> Nick Hudson <hnick@vmware.com> hnick@vmware.com <hnick@vmware.com> # There is also a: @@ -70,6 +74,7 @@ Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. Aaron Lindsay <aaron@os.amperecomputing.com> +Aaron Larson <alarson@ddci.com> Alexey Gerasimenko <x1917x@gmail.com> Alex Chen <alex.chen@huawei.com> Alex Ivanov <void@aleksoft.net> @@ -144,6 +149,7 @@ Pan Nengyuan <pannengyuan@huawei.com> Pavel Dovgaluk <dovgaluk@ispras.ru> Pavel Dovgaluk <pavel.dovgaluk@gmail.com> Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru> +Peter Chubb <peter.chubb@nicta.com.au> Peter Crosthwaite <crosthwaite.peter@gmail.com> Peter Crosthwaite <peter.crosthwaite@petalogix.com> Peter Crosthwaite <peter.crosthwaite@xilinx.com> diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases index 4792413ce7..e26b00a71d 100644 --- a/contrib/gitdm/aliases +++ b/contrib/gitdm/aliases @@ -34,8 +34,10 @@ malc@c046a42c-6fe2-441c-8c8c-71466251a162 av1474@comtv.ru # canonical emails liq3ea@163.com liq3ea@gmail.com -# some broken tags +# some broken DCO tags yuval.shaia.ml.gmail.com yuval.shaia.ml@gmail.com +jasowang jasowang@redhat.com +nicta.com.au peter.chubb@nicta.com.au # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> |