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
..
cmd.h	mlx4_core: Add support for steerable IB UD QPs	2014-01-14 14:06:50 -08:00
cq.h	IB/mlx4: Handle Ethernet L2 parameters for IP based GID addressing	2014-01-18 14:12:53 -08:00
device.h	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
doorbell.h
driver.h	IB/mlx4: Initialize SR-IOV IB support for slaves in master context	2012-09-30 20:33:32 -07:00
qp.h	include: Convert ethernet mac address declarations to use ETH_ALEN	2013-08-02 12:33:54 -07:00
srq.h	mlx4_core: Implement SRQ object lookup from srqn	2013-04-16 22:42:55 -07:00