summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-11 11:38:16 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-11 11:38:16 -0800
commit2071a0084a0323697b7d6fd5a98982194bd6929f (patch)
treecfa228cd187f600fd93b858b46e656bb24b0020e /MAINTAINERS
parentff879eb611dba859c4349048a32789e8c82afa91 (diff)
parentd01032e4fd33110f9f3a085a36cb819c1dfc5827 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0350ace39e6..7f2f29cf75f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4303,6 +4303,7 @@ F: drivers/video/aty/aty128fb.c
RALINK RT2X00 WIRELESS LAN DRIVER
P: rt2x00 project
+M: Ivo van Doorn <IvDoorn@gmail.com>
L: linux-wireless@vger.kernel.org
L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)
W: http://rt2x00.serialmonkey.com/