diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-27 22:15:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-27 22:15:01 -0400 |
| commit | 7dd30d447b7f4a129586cce8e57d0163dde876b0 (patch) | |
| tree | f6a3c26bccbd31e144c8c68fda979988739d4af5 /MAINTAINERS | |
| parent | de8856d2c11f562c60ed9340a83db4a4f829a6e6 (diff) | |
| parent | 643c61e119459e9d750087b7b34be94491efebf9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3d11fa581bb7..3adbbb294bad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1251,7 +1251,6 @@ ATHEROS ATH5K WIRELESS DRIVER | |||
| 1251 | M: Jiri Slaby <jirislaby@gmail.com> | 1251 | M: Jiri Slaby <jirislaby@gmail.com> |
| 1252 | M: Nick Kossifidis <mickflemm@gmail.com> | 1252 | M: Nick Kossifidis <mickflemm@gmail.com> |
| 1253 | M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> | 1253 | M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> |
| 1254 | M: Bob Copeland <me@bobcopeland.com> | ||
| 1255 | L: linux-wireless@vger.kernel.org | 1254 | L: linux-wireless@vger.kernel.org |
| 1256 | L: ath5k-devel@lists.ath5k.org | 1255 | L: ath5k-devel@lists.ath5k.org |
| 1257 | W: http://wireless.kernel.org/en/users/Drivers/ath5k | 1256 | W: http://wireless.kernel.org/en/users/Drivers/ath5k |