diff --git a/[refs] b/[refs]
index 0de4bc726b27..e9e7b782d385 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9d332e0874f46b91d8ac4604b68ee42b8a7a2c6
+refs/heads/master: d014e5f7f817d8a5d65457c416ade9244785f196
diff --git a/trunk/.mailmap b/trunk/.mailmap
index dfab12f809ed..eba9bf953ef5 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -66,6 +66,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
 Koushik <raghavendra.koushik@neterion.com>
 Leonid I Ananiev <leonid.i.ananiev@intel.com>
 Linas Vepstas <linas@austin.ibm.com>
+Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
 Michael Buesch <mb@bu3sch.de>
 Michael Buesch <mbuesch@freenet.de>