diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-20 04:16:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-20 04:16:40 -0400 |
| commit | c3da63f35773b04e885c5659e560d5c521d2682e (patch) | |
| tree | 5e876e7587f299cadce0b53bfaf912fb28d8283d /MAINTAINERS | |
| parent | 73e42897e8e5619eacb787d2ce69be12f47cfc21 (diff) | |
| parent | a97f4424fb4cddecf9b13c9b0e3f79924b624a7f (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7aa3081a8968..90a48e99e8b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -940,7 +940,7 @@ M: me@bobcopeland.com | |||
| 940 | L: linux-wireless@vger.kernel.org | 940 | L: linux-wireless@vger.kernel.org |
| 941 | L: ath5k-devel@lists.ath5k.org | 941 | L: ath5k-devel@lists.ath5k.org |
| 942 | S: Maintained | 942 | S: Maintained |
| 943 | F: drivers/net/wireless/ath5k/ | 943 | F: drivers/net/wireless/ath/ath5k/ |
| 944 | 944 | ||
| 945 | ATHEROS ATH9K WIRELESS DRIVER | 945 | ATHEROS ATH9K WIRELESS DRIVER |
| 946 | P: Luis R. Rodriguez | 946 | P: Luis R. Rodriguez |
| @@ -956,7 +956,7 @@ M: senthilkumar@atheros.com | |||
| 956 | L: linux-wireless@vger.kernel.org | 956 | L: linux-wireless@vger.kernel.org |
| 957 | L: ath9k-devel@lists.ath9k.org | 957 | L: ath9k-devel@lists.ath9k.org |
| 958 | S: Supported | 958 | S: Supported |
| 959 | F: drivers/net/wireless/ath9k/ | 959 | F: drivers/net/wireless/ath/ath9k/ |
| 960 | 960 | ||
| 961 | ATHEROS AR9170 WIRELESS DRIVER | 961 | ATHEROS AR9170 WIRELESS DRIVER |
| 962 | P: Christian Lamparter | 962 | P: Christian Lamparter |
| @@ -964,7 +964,7 @@ M: chunkeey@web.de | |||
| 964 | L: linux-wireless@vger.kernel.org | 964 | L: linux-wireless@vger.kernel.org |
| 965 | W: http://wireless.kernel.org/en/users/Drivers/ar9170 | 965 | W: http://wireless.kernel.org/en/users/Drivers/ar9170 |
| 966 | S: Maintained | 966 | S: Maintained |
| 967 | F: drivers/net/wireless/ar9170/ | 967 | F: drivers/net/wireless/ath/ar9170/ |
| 968 | 968 | ||
| 969 | ATI_REMOTE2 DRIVER | 969 | ATI_REMOTE2 DRIVER |
| 970 | P: Ville Syrjala | 970 | P: Ville Syrjala |