diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-01 16:08:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-01 16:08:59 -0500 |
| commit | 2ba5e1feaab2762cdf45b490e3f342fedb33f57b (patch) | |
| tree | 99467f62d8554957aa0938f8065d289db9d46ea5 /MAINTAINERS | |
| parent | 62175c75fb11ac23fca5cd5fe0baaeb8016a6c78 (diff) | |
| parent | 479600777bb588724d044815415f7d708d06644b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9d12977b6baf..95918417d94e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6767,12 +6767,12 @@ S: Maintained | |||
| 6767 | F: drivers/net/wireless/wl1251/* | 6767 | F: drivers/net/wireless/wl1251/* |
| 6768 | 6768 | ||
| 6769 | WL1271 WIRELESS DRIVER | 6769 | WL1271 WIRELESS DRIVER |
| 6770 | M: Luciano Coelho <luciano.coelho@nokia.com> | 6770 | M: Luciano Coelho <coelho@ti.com> |
| 6771 | L: linux-wireless@vger.kernel.org | 6771 | L: linux-wireless@vger.kernel.org |
| 6772 | W: http://wireless.kernel.org | 6772 | W: http://wireless.kernel.org/en/users/Drivers/wl12xx |
| 6773 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git | 6773 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git |
| 6774 | S: Maintained | 6774 | S: Maintained |
| 6775 | F: drivers/net/wireless/wl12xx/wl1271* | 6775 | F: drivers/net/wireless/wl12xx/ |
| 6776 | F: include/linux/wl12xx.h | 6776 | F: include/linux/wl12xx.h |
| 6777 | 6777 | ||
| 6778 | WL3501 WIRELESS PCMCIA CARD DRIVER | 6778 | WL3501 WIRELESS PCMCIA CARD DRIVER |