aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-06 11:33:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-06 11:33:30 -0700
commit06a1578e2448112d6f635b1a458a65e36f0f97c6 (patch)
treede48f52efe3af42efa602274db1b501749ec260e /MAINTAINERS
parent256a13dd708004082a2de0938fd614b155c259e2 (diff)
parent27676a3e166b352928a8ef7b1c0e322f3c471a3e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/ipath: Fix SM trap forwarding IB/ehca: Reject send WRs only for RESET, INIT and RTR state MAINTAINERS: Update NetEffect (iw_nes) entry IB/ipath: Fix device capability flags IB/ipath: Avoid test_bit() on u64 SDMA status value
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a1930260c33..99f566508d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2865,8 +2865,8 @@ S: Maintained
NETEFFECT IWARP RNIC DRIVER (IW_NES)
P: Faisal Latif
M: flatif@neteffect.com
-P: Nishi Gupta
-M: ngupta@neteffect.com
+P: Chien Tung
+M: ctung@neteffect.com
P: Glenn Streiff
M: gstreiff@neteffect.com
L: general@lists.openfabrics.org