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
..
mlx4	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
mlx5/core	IB/mlx5: Abort driver cleanup if teardown hca fails	2014-01-22 23:23:53 -08:00
Kconfig	mlx5: Add driver for Mellanox Connect-IB adapters	2013-07-08 10:32:24 -07:00
Makefile	mlx5: Add driver for Mellanox Connect-IB adapters	2013-07-08 10:32:24 -07:00