X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=.mailmap;h=a7bc8cabd157b89adbc2d8f6c4d6e3c88b14e3cd;hb=6e9105c73f8d2163d12d5dfd762fd75483ed30f5;hp=d33bb3a3b70a57b3fb07f3ca4b64dfc0c3d3afd0;hpb=0fd260056ef84ede8f444c66a3820811691fe884;p=tomoyo%2Ftomoyo-test1.git

diff --git a/.mailmap b/.mailmap
index d33bb3a3b70a..a7bc8cabd157 100644
--- a/.mailmap
+++ b/.mailmap
@@ -152,6 +152,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
 Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
 Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
+Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
 Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
 Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
 Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
@@ -277,3 +278,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br>
 Gustavo Padovan <padovan@profusion.mobi>
 Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
 Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
+Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
+Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>