summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorGerald Schaefer <gerald.schaefer@linux.ibm.com>2020-07-10 13:36:26 +0200
committerHeiko Carstens <hca@linux.ibm.com>2020-07-10 15:06:49 +0200
commitdd9ce2d6eeaebbdd342cbe095b7a195d569f18d3 (patch)
tree8983d57a37b2d412aa15239eff9a866d41fba79e /.mailmap
parentMAINTAINERS: update email address for Heiko Carstens (diff)
downloadlinux-dd9ce2d6eeaebbdd342cbe095b7a195d569f18d3.tar.xz
linux-dd9ce2d6eeaebbdd342cbe095b7a195d569f18d3.zip
MAINTAINERS: update email address for Gerald Schaefer
Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index ef310eeed7b5..6da12dfd10dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -90,6 +90,9 @@ Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
Frank Zago <fzago@systemfabricworks.com>
Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
+Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
+Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
+Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman <greg@kroah.com>