Roland Dreier fb1b5034e4 Merge branch 'ip-roce' into for-next ... Conflicts: drivers/infiniband/hw/mlx4/main.c		2014-01-22 23:24:21 -08:00
..
Kconfig	RDMA/ocrdma: Add dependency on INET	2014-01-19 15:16:23 -08:00
Makefile
ocrdma.h	RDMA/ocrdma: Handle Ethernet L2 parameters for IP based GID addressing	2014-01-19 15:13:58 -08:00
ocrdma_abi.h	RDMA/ocrdma: Add ABI versioning support	2013-09-02 21:18:45 -07:00
ocrdma_ah.c	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
ocrdma_ah.h
ocrdma_hw.c	RDMA/ocrdma: Handle Ethernet L2 parameters for IP based GID addressing	2014-01-19 15:13:58 -08:00
ocrdma_hw.h	RDMA/ocrdma: Handle Ethernet L2 parameters for IP based GID addressing	2014-01-19 15:13:58 -08:00
ocrdma_main.c	RDMA/ocrdma: Move ocrdma_inetaddr_event outside of "#if CONFIG_IPV6"	2014-01-19 15:14:05 -08:00
ocrdma_sli.h	RDMA/ocrdma: Fix OCRDMA_GEN2_FAMILY macro definition	2014-01-13 13:14:33 -08:00
ocrdma_verbs.c	RDMA/ocrdma: Populate GID table with IP based gids	2014-01-19 15:14:01 -08:00
ocrdma_verbs.h	RDMA/ocrdma: For ERX2 irrespective of Qid, num_posted offset is 24	2013-09-02 21:17:55 -07:00