From c637bb578da9ec41a2bb219be97613b05a53eb0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Fri, 6 Feb 2009 14:53:19 +0100
Subject: [PATCH] --- yaml --- r: 131013 b: refs/heads/master c:
 6d7f2caa77994e9c2d3cb648aa16f1e0c25b2af4 h: refs/heads/master i:   131011:
 1fa58a98e78d7fa2a882524c557a8954427c23ea v: v3

---
 [refs]         | 2 +-
 trunk/.mailmap | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 340386dfde96..657628c6d32d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04ec93fe9bc98e3bd8560f79f56fed66dfae40d5
+refs/heads/master: 6d7f2caa77994e9c2d3cb648aa16f1e0c25b2af4
diff --git a/trunk/.mailmap b/trunk/.mailmap
index 4e83e7b52d15..4c84694ed7c7 100644
--- a/trunk/.mailmap
+++ b/trunk/.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>