linux/drivers/infiniband/hw
David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c
2008-11-18 23:38:23 -08:00
..
amso1100 IB: Drop code after return statement 2008-09-20 20:06:32 -07:00
cxgb3 RDMA/cxgb3: Fix deadlock in iw_cxgb3 (hang when configuring interface) 2008-11-12 10:16:47 -08:00
ehca IB/ehca: Remove reference to special QP in case of port activation failure 2008-11-11 15:44:22 -08:00
ipath IB/ipath: Fix RDMA write with immediate copy of last packet 2008-10-27 15:31:25 -07:00
mlx4 IB/mlx4: Set umem field to NULL in mlx4_ib_alloc_fast_reg_mr() 2008-11-05 10:56:52 -08:00
mthca net: replace %p6 with %pI6 2008-10-29 12:52:50 -07:00
nes Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-18 23:38:23 -08:00