diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-09 20:33:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-09 20:33:45 -0400 |
| commit | ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312 (patch) | |
| tree | fbf291540b824183e0d9292906e9570fd344ebaa /MAINTAINERS | |
| parent | fa1a9c681377c57e233038e50479e7d7a5cc3108 (diff) | |
| parent | b2e3abdc708f8c0eff194af25362fdb239abe241 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0ab47e7fc2ec..6e2e12fd9ef8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -876,6 +876,7 @@ M: "Luis R. Rodriguez" <lrodriguez@atheros.com> | |||
| 876 | M: Bob Copeland <me@bobcopeland.com> | 876 | M: Bob Copeland <me@bobcopeland.com> |
| 877 | L: linux-wireless@vger.kernel.org | 877 | L: linux-wireless@vger.kernel.org |
| 878 | L: ath5k-devel@lists.ath5k.org | 878 | L: ath5k-devel@lists.ath5k.org |
| 879 | W: http://wireless.kernel.org/en/users/Drivers/ath5k | ||
| 879 | S: Maintained | 880 | S: Maintained |
| 880 | F: drivers/net/wireless/ath/ath5k/ | 881 | F: drivers/net/wireless/ath/ath5k/ |
| 881 | 882 | ||
| @@ -887,6 +888,7 @@ M: Vasanthakumar Thiagarajan <vasanth@atheros.com> | |||
| 887 | M: Senthil Balasubramanian <senthilkumar@atheros.com> | 888 | M: Senthil Balasubramanian <senthilkumar@atheros.com> |
| 888 | L: linux-wireless@vger.kernel.org | 889 | L: linux-wireless@vger.kernel.org |
| 889 | L: ath9k-devel@lists.ath9k.org | 890 | L: ath9k-devel@lists.ath9k.org |
| 891 | W: http://wireless.kernel.org/en/users/Drivers/ath9k | ||
| 890 | S: Supported | 892 | S: Supported |
| 891 | F: drivers/net/wireless/ath/ath9k/ | 893 | F: drivers/net/wireless/ath/ath9k/ |
| 892 | 894 | ||