From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri, 6 Feb 2009 13:53:19 +0000 (+0100)
Subject: add another mailmap entry for Uwe Kleine-König
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6d7f2caa77994e9c2d3cb648aa16f1e0c25b2af4;hp=04ec93fe9bc98e3bd8560f79f56fed66dfae40d5;p=deliverable%2Flinux.git

add another mailmap entry for Uwe Kleine-König

I created commit 7971db5a4b4176ad5df590fce07a962c643a2740 on a machine
where I forgot to set user.name and user.email before.  The default
values were not optimal.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/.mailmap b/.mailmap
index 4e83e7b52d15..4c84694ed7c7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -100,6 +100,7 @@ Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Tony Luck <tony.luck@intel.com>
 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
-Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
+Uwe Kleine-König <ukl@pengutronix.de>
+Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>