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>