From: Linus Torvalds Date: Mon, 19 Feb 2007 21:00:26 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband X-Git-Tag: v2.6.21-rc1~79 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=976fd0e29cb1647bf59f939f81a22eba55c2bf0c;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Set static rate in ib_init_ah_from_path() IB/ipath: Make ipath_map_sg() static IB/core: Fix sparse warnings about shadowed declarations RDMA/cma: Add multicast communication support IB/sa: Track multicast join/leave requests IPoIB: CM error handling thinko fix RDMA/cxgb3: Remove Open Grid Computing copyrights in iw_cxgb3 driver RDMA/cxgb3: Fail posts synchronously when in TERMINATE state RDMA/iwcm: iw_cm_id destruction race fixes IB/ehca: Change query_port() to return LINK_UP instead UNKNOWN IB/ehca: Allow en/disabling scaling code via module parameter IB/ehca: Fix race condition/locking issues in scaling code IB/ehca: Rework irq handler IPoIB: Only allow root to change between datagram and connected mode IB/mthca: Fix allocation of ICM chunks in coherent memory IB/mthca: Allow the QP state transition RESET->RESET --- 976fd0e29cb1647bf59f939f81a22eba55c2bf0c