diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /MAINTAINERS | |
| parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
| parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 558636e3a954..25f450fe1059 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2156,7 +2156,7 @@ L: netdev@vger.kernel.org | |||
| 2156 | S: Maintained | 2156 | S: Maintained |
| 2157 | 2157 | ||
| 2158 | IPATH DRIVER: | 2158 | IPATH DRIVER: |
| 2159 | P: Arthur Jones | 2159 | P: Ralph Campbell |
| 2160 | M: infinipath@qlogic.com | 2160 | M: infinipath@qlogic.com |
| 2161 | L: general@lists.openfabrics.org | 2161 | L: general@lists.openfabrics.org |
| 2162 | T: git git://git.qlogic.com/ipath-linux-2.6 | 2162 | T: git git://git.qlogic.com/ipath-linux-2.6 |