summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-05-11 12:32:14 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-05-11 12:32:14 -0700
commit66a442687f72ccf92ce50bb414565cb80ed2ab53 (patch)
treec83454aff7c23c75381a3ba15025e7498396680e /.mailmap
parent7e759fbd60a8483d2865572df85c2835756f2ae8 (diff)
downloadexternal_mesa3d-66a442687f72ccf92ce50bb414565cb80ed2ab53.zip
external_mesa3d-66a442687f72ccf92ce50bb414565cb80ed2ab53.tar.gz
external_mesa3d-66a442687f72ccf92ce50bb414565cb80ed2ab53.tar.bz2
.mailmap: Update the e-mail addresses for Kristian Høgsberg
This changes it to use his personal e-mail and adds his @intel.com address Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 5 insertions, 5 deletions
diff --git a/.mailmap b/.mailmap
index 242e88e..0d6ab33 100644
--- a/.mailmap
+++ b/.mailmap
@@ -250,11 +250,11 @@ Keith Packard <keithp@keithp.com> <keithp@neko.keithp.com>
Keith Whitwell <keithw@vmware.com> <keith@tungstengraphics.com>
Keith Whitwell <keithw@vmware.com> keithw <keithw@keithw-laptop.(none)>
-Kristian Høgsberg <krh@redhat.com> <krh@bitplanet.net>
-Kristian Høgsberg <krh@redhat.com> <krh@hinata.boston.redhat.com>
-Kristian Høgsberg <krh@redhat.com> <krh@sasori.boston.redhat.com>
-Kristian Høgsberg <krh@redhat.com> <krh@temari.boston.redhat.com>
-Kristian Høgsberg <krh@redhat.com> <krh@bitplanet.net>
+Kristian Høgsberg <krh@bitplanet.net> <krh@redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <krh@hinata.boston.redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <krh@sasori.boston.redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <krh@temari.boston.redhat.com>
+Kristian Høgsberg <krh@bitplanet.net> <kristian.h.kristensen@intel.com>
Krzesimir Nowak <qdlacz@gmail.com> <krzesimir@kinvolk.io>