diff --git a/[refs] b/[refs]
index a8ea783a05f0..8d4021073268 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bfb09a1005193be5c81ebac9f3ef85210142650
+refs/heads/master: 212387055902b65f79463d1934033255aa6b99e1
diff --git a/trunk/.mailmap b/trunk/.mailmap
index 726084286d33..dfab12f809ed 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -96,4 +96,6 @@ 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>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>