diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
| commit | 1d212aa96e1b63459486f729af9a3fa38768b801 (patch) | |
| tree | e91e74db57a5bb7884b4681cdb788d405ec8f10f /MAINTAINERS | |
| parent | 8c4877a4128e7931077b024a891a4b284d8756a3 (diff) | |
| parent | b7613370db5ba66ad81e41cd3a5417fde4d5e03c (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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4a77d0d300a5..f16ce8f46934 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1080,6 +1080,12 @@ S: Supported | |||
| 1080 | F: Documentation/aoe/ | 1080 | F: Documentation/aoe/ |
| 1081 | F: drivers/block/aoe/ | 1081 | F: drivers/block/aoe/ |
| 1082 | 1082 | ||
| 1083 | ATHEROS ATH GENERIC UTILITIES | ||
| 1084 | M: "Luis R. Rodriguez" <lrodriguez@atheros.com> | ||
| 1085 | L: linux-wireless@vger.kernel.org | ||
| 1086 | S: Supported | ||
| 1087 | F: drivers/net/wireless/ath/* | ||
| 1088 | |||
| 1083 | ATHEROS ATH5K WIRELESS DRIVER | 1089 | ATHEROS ATH5K WIRELESS DRIVER |
| 1084 | M: Jiri Slaby <jirislaby@gmail.com> | 1090 | M: Jiri Slaby <jirislaby@gmail.com> |
| 1085 | M: Nick Kossifidis <mickflemm@gmail.com> | 1091 | M: Nick Kossifidis <mickflemm@gmail.com> |