Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2a479c7005b82187437a64b74c75fe16a361f0da..6bd1cd5c60df74404ae32e9f623606195dcd120a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5978,7 +5978,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