summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-16 23:43:01 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-16 23:43:01 -0800
commit8494347eedd2facf474021c615d1d07c62e04afd (patch)
treeceba54fc99271dc45c629b9a60e98022d9735a05 /MAINTAINERS
parent91e9c07bd635353d1a278bdb38dbb56ac371bcb8 (diff)
parent505c92470bda486be589729514d3ed5302fb0551 (diff)
downloadlinux-stable-8494347eedd2facf474021c615d1d07c62e04afd.tar.gz
linux-stable-8494347eedd2facf474021c615d1d07c62e04afd.tar.bz2
linux-stable-8494347eedd2facf474021c615d1d07c62e04afd.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b37e0cdd7632..887b50b27cce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4281,6 +4281,7 @@ F: drivers/video/aty/aty128fb.c
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/
@@ -4368,7 +4369,7 @@ RFKILL
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