Linus Torvalds 724bdd097e 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/ehca: Reject dynamic memory add/remove when ehca adapter is present IB/ehca: Fix reported max number of QPs and CQs in systems with >1 adapter IPoIB: Set netdev offload features properly for child (VLAN) interfaces IPoIB: Clean up ethtool support mlx4_core: Add Ethernet PCI device IDs mlx4_en: Add driver for Mellanox ConnectX 10GbE NIC mlx4_core: Multiple port type support mlx4_core: Ethernet MAC/VLAN management mlx4_core: Get ethernet MTU and default address from firmware mlx4_core: Support multiple pre-reserved QP regions Update NetEffect maintainer emails to Intel emails RDMA/cxgb3: Remove cmid reference on tid allocation failures IB/mad: Use krealloc() to resize snoop table IPoIB: Always initialize poll_timer to avoid crash on unload IB/ehca: Don't allow creating UC QP with SRQ mlx4_core: Add QP range reservation support RDMA/ucma: Test ucma_alloc_multicast() return against NULL, not with IS_ERR()		2008-10-23 08:16:03 -07:00
..
amso1100	IB: Drop code after return statement	2008-09-20 20:06:32 -07:00
cxgb3	RDMA/cxgb3: Remove cmid reference on tid allocation failures	2008-10-15 10:50:34 -07:00
ehca	IB/ehca: Reject dynamic memory add/remove when ehca adapter is present	2008-10-22 15:54:38 -07:00
ipath	device create: infiniband: convert device_create_drvdata to device_create	2008-10-16 09:24:42 -07:00
mlx4	mlx4_core: Multiple port type support	2008-10-22 15:38:42 -07:00
mthca	IB/mthca: Use pci_request_regions()	2008-09-29 21:37:33 -07:00
nes	Merge branches 'cma', 'cxgb3', 'ehca', 'ipath', 'ipoib', 'mad', 'misc', 'mlx4', 'mthca' and 'nes' into for-next	2008-10-09 17:41:15 -07:00