diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 14:33:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 14:33:30 -0400 |
| commit | 06a1578e2448112d6f635b1a458a65e36f0f97c6 (patch) | |
| tree | de48f52efe3af42efa602274db1b501749ec260e /MAINTAINERS | |
| parent | 256a13dd708004082a2de0938fd614b155c259e2 (diff) | |
| parent | 27676a3e166b352928a8ef7b1c0e322f3c471a3e (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-- | 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 | |||
| 2865 | NETEFFECT IWARP RNIC DRIVER (IW_NES) | 2865 | NETEFFECT IWARP RNIC DRIVER (IW_NES) |
| 2866 | P: Faisal Latif | 2866 | P: Faisal Latif |
| 2867 | M: flatif@neteffect.com | 2867 | M: flatif@neteffect.com |
| 2868 | P: Nishi Gupta | 2868 | P: Chien Tung |
| 2869 | M: ngupta@neteffect.com | 2869 | M: ctung@neteffect.com |
| 2870 | P: Glenn Streiff | 2870 | P: Glenn Streiff |
| 2871 | M: gstreiff@neteffect.com | 2871 | M: gstreiff@neteffect.com |
| 2872 | L: general@lists.openfabrics.org | 2872 | L: general@lists.openfabrics.org |