summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c156a8b4d845..08b80428f583 100644
--- a/.mailmap
+++ b/.mailmap
@@ -69,6 +69,7 @@ Jean Tourrilhes <jt@hpl.hp.com>
69Jeff Garzik <jgarzik@pretzel.yyz.us> 69Jeff Garzik <jgarzik@pretzel.yyz.us>
70Jens Axboe <axboe@suse.de> 70Jens Axboe <axboe@suse.de>
71Jens Osterkamp <Jens.Osterkamp@de.ibm.com> 71Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
72John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
72John Stultz <johnstul@us.ibm.com> 73John Stultz <johnstul@us.ibm.com>
73<josh@joshtriplett.org> <josh@freedesktop.org> 74<josh@joshtriplett.org> <josh@freedesktop.org>
74<josh@joshtriplett.org> <josh@kernel.org> 75<josh@joshtriplett.org> <josh@kernel.org>