diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-09 11:01:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-09 11:01:37 -0500 |
| commit | a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae (patch) | |
| tree | facc20b09719093ea35cd05374f31b34df95ae15 /MAINTAINERS | |
| parent | c9be4a5c49cf51cc70a993f004c5bb30067a65ce (diff) | |
| parent | 5e20a4b53094651d80f856ff55a916b999dbb57a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 915564eda145..7a39670d61dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1351,6 +1351,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k | |||
| 1351 | S: Supported | 1351 | S: Supported |
| 1352 | F: drivers/net/wireless/ath/ath9k/ | 1352 | F: drivers/net/wireless/ath/ath9k/ |
| 1353 | 1353 | ||
| 1354 | WILOCITY WIL6210 WIRELESS DRIVER | ||
| 1355 | M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> | ||
| 1356 | L: linux-wireless@vger.kernel.org | ||
| 1357 | L: wil6210@qca.qualcomm.com | ||
| 1358 | S: Supported | ||
| 1359 | W: http://wireless.kernel.org/en/users/Drivers/wil6210 | ||
| 1360 | F: drivers/net/wireless/ath/wil6210/ | ||
| 1361 | |||
| 1354 | CARL9170 LINUX COMMUNITY WIRELESS DRIVER | 1362 | CARL9170 LINUX COMMUNITY WIRELESS DRIVER |
| 1355 | M: Christian Lamparter <chunkeey@googlemail.com> | 1363 | M: Christian Lamparter <chunkeey@googlemail.com> |
| 1356 | L: linux-wireless@vger.kernel.org | 1364 | L: linux-wireless@vger.kernel.org |