diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-11 14:38:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-11 14:38:16 -0500 |
| commit | 2071a0084a0323697b7d6fd5a98982194bd6929f (patch) | |
| tree | cfa228cd187f600fd93b858b46e656bb24b0020e /MAINTAINERS | |
| parent | ff879eb611dba859c4349048a32789e8c82afa91 (diff) | |
| parent | d01032e4fd33110f9f3a085a36cb819c1dfc5827 (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-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0350ace39e6c..7f2f29cf75ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4303,6 +4303,7 @@ F: drivers/video/aty/aty128fb.c | |||
| 4303 | 4303 | ||
| 4304 | RALINK RT2X00 WIRELESS LAN DRIVER | 4304 | RALINK RT2X00 WIRELESS LAN DRIVER |
| 4305 | P: rt2x00 project | 4305 | P: rt2x00 project |
| 4306 | M: Ivo van Doorn <IvDoorn@gmail.com> | ||
| 4306 | L: linux-wireless@vger.kernel.org | 4307 | L: linux-wireless@vger.kernel.org |
| 4307 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) | 4308 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) |
| 4308 | W: http://rt2x00.serialmonkey.com/ | 4309 | W: http://rt2x00.serialmonkey.com/ |