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
..
ib.h	RDMA/cma: Define native IB address	2013-06-20 13:08:01 -07:00
ib_addr.h	IB/cma: IBoE (RoCE) IP-based GID addressing	2014-01-18 14:12:35 -08:00
ib_cache.h	IB/core: Add ib_find_exact_cached_pkey()	2012-09-30 20:33:30 -07:00
ib_cm.h	IB/core: Ethernet L2 attributes in verbs/cm structures	2014-01-14 14:20:54 -08:00
ib_fmr_pool.h
ib_mad.h	IB/core: Fix IB_SA_COMP_MASK macro	2012-05-18 17:16:11 -07:00
ib_marshall.h
ib_pack.h	IB/core: Ethernet L2 attributes in verbs/cm structures	2014-01-14 14:20:54 -08:00
ib_pma.h
ib_sa.h	IB/core: Ethernet L2 attributes in verbs/cm structures	2014-01-14 14:20:54 -08:00
ib_smi.h
ib_umem.h
ib_verbs.h	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
iw_cm.h	RDMA/cma: Add IPv6 support for iWARP	2013-08-12 12:32:31 -07:00
rdma_cm.h	RDMA/cma: Export cma_get_service_id()	2013-06-20 23:35:41 -07:00
rdma_cm_ib.h
rdma_netlink.h	UAPI: (Scripted) Disintegrate include/rdma	2012-11-22 00:43:10 -08:00