diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-04 00:06:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-04 00:06:43 +0300 |
| commit | fd95240568977ebd1ebb15b071464e0e392cde1a (patch) | |
| tree | 6458cf8f33a8b8ab6a8098208de29c83206ca3aa /MAINTAINERS | |
| parent | cdfb74d4c2e3bcc9383121af2591d0ae15007ba7 (diff) | |
| parent | fa9a741b841d0c2db04875310a06e8718c56fd4f (diff) | |
| download | linux-fd95240568977ebd1ebb15b071464e0e392cde1a.tar.xz | |
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 P: rt2x00 project M: Ivo van Doorn <IvDoorn@gmail.com> M: Gertjan van Wingerde <gwingerde@gmail.com> +M: Helmut Schaa <helmut.schaa@googlemail.com> L: linux-wireless@vger.kernel.org L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) W: http://rt2x00.serialmonkey.com/ @@ -6767,12 +6768,12 @@ S: Maintained F: drivers/net/wireless/wl1251/* WL1271 WIRELESS DRIVER -M: Luciano Coelho <luciano.coelho@nokia.com> +M: Luciano Coelho <coelho@ti.com> L: linux-wireless@vger.kernel.org -W: http://wireless.kernel.org +W: http://wireless.kernel.org/en/users/Drivers/wl12xx T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git S: Maintained -F: drivers/net/wireless/wl12xx/wl1271* +F: drivers/net/wireless/wl12xx/ F: include/linux/wl12xx.h WL3501 WIRELESS PCMCIA CARD DRIVER |