Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[uclinux-h8/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fe1cd41..b2e3f35 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4304,6 +4304,7 @@ F:        drivers/video/aty/aty128fb.c
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:     rt2x00 project
 M:     Ivo van Doorn <IvDoorn@gmail.com>
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:     rt2x00 project
 M:     Ivo van Doorn <IvDoorn@gmail.com>

+M:     Gertjan van Wingerde <gwingerde@gmail.com>

 L:     linux-wireless@vger.kernel.org
 L:     users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:     http://rt2x00.serialmonkey.com/
 L:     linux-wireless@vger.kernel.org
 L:     users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:     http://rt2x00.serialmonkey.com/


@@ -4391,7 +4392,7 @@ RFKILL
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained

-F      Documentation/rfkill.txt
+F:     Documentation/rfkill.txt

 F:     net/rfkill/
 
 RISCOM8 DRIVER
 F:     net/rfkill/
 
 RISCOM8 DRIVER