diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-03 16:06:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-03 16:06:43 -0500 |
| commit | fd95240568977ebd1ebb15b071464e0e392cde1a (patch) | |
| tree | 6458cf8f33a8b8ab6a8098208de29c83206ca3aa /MAINTAINERS | |
| parent | cdfb74d4c2e3bcc9383121af2591d0ae15007ba7 (diff) | |
| parent | fa9a741b841d0c2db04875310a06e8718c56fd4f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9d12977b6baf..424887b4a414 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5127,6 +5127,7 @@ RALINK RT2X00 WIRELESS LAN DRIVER | |||
| 5127 | P: rt2x00 project | 5127 | P: rt2x00 project |
| 5128 | M: Ivo van Doorn <IvDoorn@gmail.com> | 5128 | M: Ivo van Doorn <IvDoorn@gmail.com> |
| 5129 | M: Gertjan van Wingerde <gwingerde@gmail.com> | 5129 | M: Gertjan van Wingerde <gwingerde@gmail.com> |
| 5130 | M: Helmut Schaa <helmut.schaa@googlemail.com> | ||
| 5130 | L: linux-wireless@vger.kernel.org | 5131 | L: linux-wireless@vger.kernel.org |
| 5131 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) | 5132 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) |
| 5132 | W: http://rt2x00.serialmonkey.com/ | 5133 | W: http://rt2x00.serialmonkey.com/ |
| @@ -6767,12 +6768,12 @@ S: Maintained | |||
| 6767 | F: drivers/net/wireless/wl1251/* | 6768 | F: drivers/net/wireless/wl1251/* |
| 6768 | 6769 | ||
| 6769 | WL1271 WIRELESS DRIVER | 6770 | WL1271 WIRELESS DRIVER |
| 6770 | M: Luciano Coelho <luciano.coelho@nokia.com> | 6771 | M: Luciano Coelho <coelho@ti.com> |
| 6771 | L: linux-wireless@vger.kernel.org | 6772 | L: linux-wireless@vger.kernel.org |
| 6772 | W: http://wireless.kernel.org | 6773 | W: http://wireless.kernel.org/en/users/Drivers/wl12xx |
| 6773 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git | 6774 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git |
| 6774 | S: Maintained | 6775 | S: Maintained |
| 6775 | F: drivers/net/wireless/wl12xx/wl1271* | 6776 | F: drivers/net/wireless/wl12xx/ |
| 6776 | F: include/linux/wl12xx.h | 6777 | F: include/linux/wl12xx.h |
| 6777 | 6778 | ||
| 6778 | WL3501 WIRELESS PCMCIA CARD DRIVER | 6779 | WL3501 WIRELESS PCMCIA CARD DRIVER |