diff --git a/[refs] b/[refs]
index d5a5f74de672..737ea25a0992 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 179f7ebff6be45738c6e2fa68c8d2cc5c2c6308e
+refs/heads/master: bfa0b1c3ca802bd9813987e861d932ddc1c8cf50
diff --git a/trunk/.mailmap b/trunk/.mailmap
index 97f7b4fb6139..4e83e7b52d15 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -32,6 +32,7 @@ Christoph Hellwig <hch@lst.de>
 Corey Minyard <minyard@acm.org>
 David Brownell <david-b@pacbell.net>
 David Woodhouse <dwmw2@shinybook.infradead.org>
+Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 Domen Puncer <domen@coderock.org>
 Douglas Gilbert <dougg@torque.net>
 Ed L. Cashin <ecashin@coraid.com>
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 141aff67bd6d..ee65a28a9cc9 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -616,7 +616,7 @@ M:	mkpetch@internode.on.net
 S:	Maintained
 
 ARM/TOSA MACHINE SUPPORT
-P:	Dmitry Baryshkov
+P:	Dmitry Eremin-Solenikov
 M:	dbaryshkov@gmail.com
 P:	Dirk Opfer
 M:	dirk@opfer-online.de