diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
| commit | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (patch) | |
| tree | b5e5787a6d5c15e589d275c7434ebbf341257234 /MAINTAINERS | |
| parent | db62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff) | |
| parent | 320d6c1b56de5f461c6062625b9664095f90ee95 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1eacf29f0431..0d83e5898233 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1205,7 +1205,7 @@ ATHEROS AR9170 WIRELESS DRIVER | |||
| 1205 | M: Christian Lamparter <chunkeey@web.de> | 1205 | M: Christian Lamparter <chunkeey@web.de> |
| 1206 | L: linux-wireless@vger.kernel.org | 1206 | L: linux-wireless@vger.kernel.org |
| 1207 | W: http://wireless.kernel.org/en/users/Drivers/ar9170 | 1207 | W: http://wireless.kernel.org/en/users/Drivers/ar9170 |
| 1208 | S: Maintained | 1208 | S: Obsolete |
| 1209 | F: drivers/net/wireless/ath/ar9170/ | 1209 | F: drivers/net/wireless/ath/ar9170/ |
| 1210 | 1210 | ||
| 1211 | CARL9170 LINUX COMMUNITY WIRELESS DRIVER | 1211 | CARL9170 LINUX COMMUNITY WIRELESS DRIVER |