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

RDMA: Improve include file coding style

2008-07-14 23:48:44 -07:00

ib_cm.h

trivial: fix typo "to to" in multiple files

2009-09-21 15:14:55 +02:00

ib_fmr_pool.h

RDMA: Improve include file coding style

2008-07-14 23:48:44 -07:00

ib_mad.h

Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next

2009-03-24 20:44:41 -07:00

ib_marshall.h

RDMA/cma: Export rdma cm interface to userspace

2006-12-12 11:50:22 -08:00

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: Remove __constant_{endian} uses

2009-01-17 17:11:57 -08:00

ib_umem.h

IB: expand ib_umem_get() prototype

2008-04-29 08:06:12 -07:00

ib_user_cm.h

RDMA: Improve include file coding style

2008-07-14 23:48:44 -07:00

ib_user_mad.h

RDMA: Improve include file coding style

2008-07-14 23:48:44 -07:00

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

RDMA/core: Add memory management extensions support

2008-07-14 23:48:45 -07:00

ib_verbs.h

IB/core: Pack struct ib_device a little tighter

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

iw_cm.h

RDMA: Improve include file coding style

2008-07-14 23:48:44 -07:00

Kbuild

[HEADERS] One line per header in Kbuild files to reduce conflicts

2006-09-19 12:43:58 +01:00

rdma_cm_ib.h

RDMA: Fix license text

2008-07-14 23:48:43 -07:00

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