diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-01 15:39:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-01 15:39:56 -0500 |
| commit | ad86c55bac643a745f480d26689d153ec0f38b04 (patch) | |
| tree | 8ae3e20d2f3619021393166fe1f50a8ca00c1c33 /MAINTAINERS | |
| parent | 21eb218989523b7bee28900aaec9f9296b70fa27 (diff) | |
| parent | 39731b78b4afebb7501c05b68e2443a1b250b41c (diff) | |
| download | linux-stable-ad86c55bac643a745f480d26689d153ec0f38b04.tar.gz linux-stable-ad86c55bac643a745f480d26689d153ec0f38b04.tar.bz2 linux-stable-ad86c55bac643a745f480d26689d153ec0f38b04.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9bae7901162d..0d58ff5d2a62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1430,7 +1430,7 @@ F: Documentation/aoe/ F: drivers/block/aoe/ ATHEROS ATH GENERIC UTILITIES -M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> +M: "Luis R. Rodriguez" <mcgrof@do-not-panic.com> L: linux-wireless@vger.kernel.org S: Supported F: drivers/net/wireless/ath/* @@ -1438,7 +1438,7 @@ F: drivers/net/wireless/ath/* ATHEROS ATH5K WIRELESS DRIVER M: Jiri Slaby <jirislaby@gmail.com> M: Nick Kossifidis <mickflemm@gmail.com> -M: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> +M: "Luis R. Rodriguez" <mcgrof@do-not-panic.com> L: linux-wireless@vger.kernel.org L: ath5k-devel@lists.ath5k.org W: http://wireless.kernel.org/en/users/Drivers/ath5k |