diff --git a/[refs] b/[refs]
index b2e6f8847ae2..be71a9e18b17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7407d1619713f4b1fdff3a485e1bd8e77bd480d
+refs/heads/master: 9f0939bf498273b91f79a8ec2f2aa773f8615bb8
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 6f99e1260db8..98710933ac10 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -5266,7 +5266,7 @@ S:	Maintained
 F:	drivers/net/wireless/rtl818x/rtl8180/
 
 RTL8187 WIRELESS DRIVER
-M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+M:	Herton Ronaldo Krzesinski <herton@canonical.com>
 M:	Hin-Tak Leung <htl10@users.sourceforge.net>
 M:	Larry Finger <Larry.Finger@lwfinger.net>
 L:	linux-wireless@vger.kernel.org
@@ -6104,7 +6104,7 @@ S:	Maintained
 F:	security/tomoyo/
 
 TOPSTAR LAPTOP EXTRAS DRIVER
-M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+M:	Herton Ronaldo Krzesinski <herton@canonical.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
 F:	drivers/platform/x86/topstar-laptop.c