summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-18 02:51:39 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-18 02:51:47 +0100
commite49b5aada0df13c9e8fce7338ae34e075dd7ccd1 (patch)
tree132bdd1a60b3e683dac4e0de08f13ade991bd719 /.mailmap
parent9f5650aecb22a1d864b2c0b749910556795f1490 (diff)
prepare NEWS
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap11
1 files changed, 6 insertions, 5 deletions
diff --git a/.mailmap b/.mailmap
index e1cdf0616f..7617f32403 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,11 +4,12 @@ Kay Sievers <kay@vrfy.org> <kay.sievers@suse.de>
Kay Sievers <kay@vrfy.org> <kay@pim.off.vrfy.org>
Kay Sievers <kay@vrfy.org> <kay@pim>
Kay Sievers <kay@vrfy.org> <kay@yik.fritz.box>
-Greg KH <greg@kroah.com>
-Greg KH <greg@kroah.com> <greg@kroah.com>
-Greg KH <greg@kroah.com> <greg@press.(none)>
-Greg KH <greg@kroah.com> <gregkh@suse.de>
-Greg KH <greg@kroah.com> <greg@bucket.kroah.org>
+Greg Kroah-Hartman <greg@kroah.com>
+Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com>
+Greg Kroah-Hartman <greg@kroah.com> <greg@press.(none)>
+Greg Kroah-Hartman <greg@kroah.com> <gregkh@suse.de>
+Greg Kroah-Hartman <greg@kroah.com> <greg@bucket.kroah.org>
+Greg Kroah-Hartman <greg@kroah.com> <gregkh@linuxfoundation.org>
Harald Hoyer <harald@redhat.com>
David Zeuthen <david@fubar.dk>
David Zeuthen <david@fubar.dk> <davidz@redhat.com>