diff --git a/[refs] b/[refs]
index 657628c6d32d..e0c57dcd50f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7f2caa77994e9c2d3cb648aa16f1e0c25b2af4
+refs/heads/master: bcee402e764ccbdb507fe56936230af7cb57c813
diff --git a/trunk/.mailmap b/trunk/.mailmap
index 4c84694ed7c7..a62e6a84fd1e 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -92,6 +92,7 @@ Rudolf Marek <R.Marek@sh.cvut.cz>
 Rui Saraiva <rmps@joel.ist.utl.pt>
 Sachin P Sant <ssant@in.ibm.com>
 Sam Ravnborg <sam@mars.ravnborg.org>
+Sascha Hauer <s.hauer@pengutronix.de>
 S.Çağlar Onur <caglar@pardus.org.tr>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>