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

..

ah.c

mlx5: Add driver for Mellanox Connect-IB adapters

2013-07-08 10:32:24 -07:00

cq.c

IB/mlx5: Verify reserved fields are cleared

2014-01-22 23:23:54 -08:00

doorbell.c

mlx5: Add driver for Mellanox Connect-IB adapters

2013-07-08 10:32:24 -07:00

Kconfig

mlx5: Add driver for Mellanox Connect-IB adapters

2013-07-08 10:32:24 -07:00

mad.c

mlx5: Add driver for Mellanox Connect-IB adapters

2013-07-08 10:32:24 -07:00

main.c

IB/mlx5: Fix micro UAR allocator

2014-01-14 13:54:23 -08:00

Makefile

mlx5: Add driver for Mellanox Connect-IB adapters

2013-07-08 10:32:24 -07:00

mem.c

mlx5: Add driver for Mellanox Connect-IB adapters

2013-07-08 10:32:24 -07:00

mlx5_ib.h

IB/mlx5: Add support for resize CQ

2014-01-22 23:23:50 -08:00

mr.c

IB/mlx5: Remove unused code in mr.c

2014-01-14 13:54:23 -08:00

qp.c

Merge branch 'ip-roce' into for-next

2014-01-22 23:24:21 -08:00

srq.c

mlx5: Use enum to indicate adapter page size

2013-11-08 14:43:01 -08:00

user.h

IB/mlx5: Add support for resize CQ

2014-01-22 23:23:50 -08:00