diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-05-01 11:23:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-01 11:23:21 -0400 |
commit | 812e4dafa42c18bb5d2f810dc1dcf57284a15717 (patch) | |
tree | 92727f799133ee7843542befddeb1a46fef05efe /MAINTAINERS | |
parent | 22041fb05b66387b2854f789d1e1f55c7d07b4f4 (diff) | |
parent | 3234f5b06fc3094176a86772cc64baf3decc98fc (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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1241a73cc230..db5971f401ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -7277,7 +7277,6 @@ F: drivers/video/aty/aty128fb.c | |||
7277 | RALINK RT2X00 WIRELESS LAN DRIVER | 7277 | RALINK RT2X00 WIRELESS LAN DRIVER |
7278 | P: rt2x00 project | 7278 | P: rt2x00 project |
7279 | M: Ivo van Doorn <IvDoorn@gmail.com> | 7279 | M: Ivo van Doorn <IvDoorn@gmail.com> |
7280 | M: Gertjan van Wingerde <gwingerde@gmail.com> | ||
7281 | M: Helmut Schaa <helmut.schaa@googlemail.com> | 7280 | M: Helmut Schaa <helmut.schaa@googlemail.com> |
7282 | L: linux-wireless@vger.kernel.org | 7281 | L: linux-wireless@vger.kernel.org |
7283 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) | 7282 | L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) |