diff --git a/[refs] b/[refs]
index 164df4effbfc..1abadbebaaf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8288317b5076fde0bb4e91cd4754379c850be7a
+refs/heads/master: 4fe0657ed41590ea4c2d4920c76836cb4a483caf
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index cda50d690735..129117fe6490 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -742,7 +742,7 @@ M:	jirislaby@gmail.com
 P:	Nick Kossifidis
 M:	mickflemm@gmail.com
 P:	Luis R. Rodriguez
-M:	mcgrof@gmail.com
+M:	lrodriguez@atheros.com
 P:	Bob Copeland
 M:	me@bobcopeland.com
 L:	linux-wireless@vger.kernel.org