summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 22:03:52 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 22:03:52 -0400
commit716b43303df605510399d6da0d0dd4e2ea376e7c (patch)
tree57412aaf516b7a10b4b81064aeda318514fec168 /MAINTAINERS
parent5696c1944a33b4434a9a1ebb6383b906afd43a10 (diff)
parentc7b645f934e52a54af58142d91fb51f881f8ce26 (diff)
Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a0b0d595d17c..4db63de9652a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1149,7 +1149,7 @@ S: Maintained
INFINIBAND SUBSYSTEM
P: Roland Dreier
-M: roland@topspin.com
+M: rolandd@cisco.com
P: Sean Hefty
M: mshefty@ichips.intel.com
P: Hal Rosenstock