diff options
author | 2008-06-06 11:33:30 -0700 | |
---|---|---|
committer | 2008-06-06 11:33:30 -0700 | |
commit | 06a1578e2448112d6f635b1a458a65e36f0f97c6 (patch) | |
tree | de48f52efe3af42efa602274db1b501749ec260e /MAINTAINERS | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
parent | IB/ipath: Fix SM trap forwarding (diff) | |
download | linux-06a1578e2448112d6f635b1a458a65e36f0f97c6.tar.gz linux-06a1578e2448112d6f635b1a458a65e36f0f97c6.tar.bz2 linux-06a1578e2448112d6f635b1a458a65e36f0f97c6.zip |
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-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a1930260c33f..99f566508d70 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 |