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_addr.h

IB/cma: IBoE (RoCE) IP-based GID addressing

2014-01-18 14:12:35 -08:00

ib_cache.h

…

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_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

ib.h

…

iw_cm.h

…

rdma_cm_ib.h

…

rdma_cm.h

…

rdma_netlink.h

…