diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 09:14:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 09:14:34 -0700 |
commit | 6c47d773e7d8f784996d9027f035379baa19ded7 (patch) | |
tree | bae50321bed6623a1da18732bca5bbfe9b6b8aaf /MAINTAINERS | |
parent | 2f44bbb495dd3e6d0209eff2257438ab9c570e5b (diff) | |
parent | d7c1fbd6606085dbf95e47068d6bd2db8a180e38 (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:
RDMA/iwcm: Don't access a cm_id after dropping reference
IB/iser: Handle iser_device allocation error gracefully
IB/iser: Fix list iteration bug
RDMA/cxgb3: Fix iwch_create_cq() off-by-one error
RDMA/cxgb3: Return correct max_inline_data when creating a QP
IB/fmr_pool: Flush all dirty FMRs from ib_fmr_pool_flush()
Revert "IB/fmr_pool: ib_fmr_pool_flush() should flush all dirty FMRs"
IB/cm: Flush workqueue when removing device
MAINTAINERS: update ipath owner
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 558636e3a95..25f450fe105 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2156,7 +2156,7 @@ L: netdev@vger.kernel.org S: Maintained IPATH DRIVER: -P: Arthur Jones +P: Ralph Campbell M: infinipath@qlogic.com L: general@lists.openfabrics.org T: git git://git.qlogic.com/ipath-linux-2.6 |