Roland Dreier 42872c7a5e Merge branches 'misc' and 'mlx4' into for-next ...

Conflicts:
	drivers/infiniband/hw/mlx4/main.c
	drivers/net/ethernet/mellanox/mlx4/main.c
	include/linux/mlx4/device.h

2012-03-12 16:25:28 -07:00

..

core

RDMA/iwcm: Reject connect requests if cmid is not in LISTEN state

2012-03-07 15:14:53 -08:00

hw

Merge branches 'misc' and 'mlx4' into for-next

2012-03-12 16:25:28 -07:00

ulp

IB: Change CQE "csum_ok" field to a bit flag

2012-03-08 12:34:27 -08:00

Kconfig

ib_srpt: Initial SRP Target merge for v3.3-rc1

2011-12-16 06:33:56 +00:00

Makefile

ib_srpt: Initial SRP Target merge for v3.3-rc1

2011-12-16 06:33:56 +00:00