diff --git a/[refs] b/[refs]
index 154c653925a3..cd55580754b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c332a4b8eed69a6853dbdbdf16696a45b93e2bf8
+refs/heads/master: 54f2d7361da09f3fc2b5407f93ad3b86df951577
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index ea781c1cfb5a..2b4a4d2f2ece 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -5863,7 +5863,7 @@ S:	Maintained
 F:	drivers/input/misc/wistron_btns.c
 
 WL1251 WIRELESS DRIVER
-M:	Kalle Valo <kalle.valo@nokia.com>
+M:	Kalle Valo <kalle.valo@iki.fi>
 L:	linux-wireless@vger.kernel.org
 W:	http://wireless.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git