aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-01 11:23:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-01 11:23:21 -0400
commit812e4dafa42c18bb5d2f810dc1dcf57284a15717 (patch)
tree92727f799133ee7843542befddeb1a46fef05efe /MAINTAINERS
parent22041fb05b66387b2854f789d1e1f55c7d07b4f4 (diff)
parent3234f5b06fc3094176a86772cc64baf3decc98fc (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--MAINTAINERS1
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
7277RALINK RT2X00 WIRELESS LAN DRIVER 7277RALINK RT2X00 WIRELESS LAN DRIVER
7278P: rt2x00 project 7278P: rt2x00 project
7279M: Ivo van Doorn <IvDoorn@gmail.com> 7279M: Ivo van Doorn <IvDoorn@gmail.com>
7280M: Gertjan van Wingerde <gwingerde@gmail.com>
7281M: Helmut Schaa <helmut.schaa@googlemail.com> 7280M: Helmut Schaa <helmut.schaa@googlemail.com>
7282L: linux-wireless@vger.kernel.org 7281L: linux-wireless@vger.kernel.org
7283L: users@rt2x00.serialmonkey.com (moderated for non-subscribers) 7282L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)