summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-07 10:19:31 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-07 10:19:31 +0100
commitba3b8bb1263dfb87914ef0ccf5f3a78604b3686b (patch)
tree142b9e56d8cae8f2c5514582bd767470a2b4147e /.mailmap
parente0efb3168d34dc8c8c72718672b8902e40efff8f (diff)
parent0477e92881850d44910a7e94fc2c46f96faa131f (diff)
Merge 5.10-rc7 into tty-next
We want the tty fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 505b3d771964..225546cc8028 100644
--- a/.mailmap
+++ b/.mailmap
@@ -290,6 +290,7 @@ Santosh Shilimkar <ssantosh@kernel.org>
Sarangdhar Joshi <spjoshi@codeaurora.org>
Sascha Hauer <s.hauer@pengutronix.de>
S.Çağlar Onur <caglar@pardus.org.tr>
+Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
@@ -321,6 +322,8 @@ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
+Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Uwe Kleine-König <ukleinek@strlen.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>