diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 22:50:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 22:50:10 -0400 |
| commit | aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f (patch) | |
| tree | 57ca3e27227695acbd97408eabb0f967726c3b51 /MAINTAINERS | |
| parent | f45727d52d1581e9ff4df9d1a12a60789ad2d1eb (diff) | |
| parent | 245ac8738b0b840552d56b842e70e750d65911cc (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c21909a40414..4add2f289591 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1156,7 +1156,7 @@ S: Maintained | |||
| 1156 | 1156 | ||
| 1157 | INFINIBAND SUBSYSTEM | 1157 | INFINIBAND SUBSYSTEM |
| 1158 | P: Roland Dreier | 1158 | P: Roland Dreier |
| 1159 | M: roland@topspin.com | 1159 | M: rolandd@cisco.com |
| 1160 | P: Sean Hefty | 1160 | P: Sean Hefty |
| 1161 | M: mshefty@ichips.intel.com | 1161 | M: mshefty@ichips.intel.com |
| 1162 | P: Hal Rosenstock | 1162 | P: Hal Rosenstock |