Roland Dreier fe8875e5a4 Merge branch 'misc' into for-next ...

Conflicts:
	drivers/infiniband/core/uverbs_main.c

2010-03-01 23:52:31 -08:00

..

ib_addr.h

RDMA/cm: fix loopback address support

2009-11-19 13:26:06 -08:00

ib_cache.h

…

ib_cm.h

…

ib_fmr_pool.h

…

ib_mad.h

…

ib_marshall.h

…

ib_pack.h

IB/core: Fix and clean up ib_ud_header_init()

2010-02-24 14:54:10 -08:00

ib_sa.h

RDMA/ucma: Add option to manually set IB path

2009-11-16 09:30:33 -08:00

ib_smi.h

…

ib_umem.h

…

ib_user_cm.h

…

ib_user_mad.h

…

ib_user_sa.h

RDMA/ucma: Add option to manually set IB path

2009-11-16 09:30:33 -08:00

ib_user_verbs.h

…

ib_verbs.h

IB/core: Pack struct ib_device a little tighter

2010-02-24 10:23:49 -08:00

iw_cm.h

…

Kbuild

…

rdma_cm_ib.h

…

rdma_cm.h

RDMA/cm: Remove unused definition of RDMA_PS_SCTP

2010-02-11 15:40:25 -08:00

rdma_user_cm.h

RDMA/ucma: Add option to manually set IB path

2009-11-16 09:30:33 -08:00