diff --git a/[refs] b/[refs]
index be553531ae7c..8b8873774050 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 531f6ed7de911e975352fbb2b228367121da630a
+refs/heads/master: 17c22978562df42e608a9c10bc46a0e7f5660094
diff --git a/trunk/.mailmap b/trunk/.mailmap
index eba9bf953ef5..97f7b4fb6139 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -80,6 +80,8 @@ Nguyen Anh Quynh <aquynh@gmail.com>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
 Patrick Mochel <mochel@digitalimplant.org>
 Peter A Jonsson <pj@ludd.ltu.se>
+Peter Oruba <peter@oruba.de>
+Peter Oruba <peter.oruba@amd.com>
 Praveen BP <praveenbp@ti.com>
 Rajesh Shah <rajesh.shah@intel.com>
 Ralf Baechle <ralf@linux-mips.org>