Roland Dreier 42872c7a5e Merge branches 'misc' and 'mlx4' into for-next ...

Conflicts:
	drivers/infiniband/hw/mlx4/main.c
	drivers/net/ethernet/mellanox/mlx4/main.c
	include/linux/mlx4/device.h

2012-03-12 16:25:28 -07:00

..

cmd.h

mlx4_core: Modify driver initialization flow to accommodate SRIOV for Ethernet

2011-12-13 13:56:08 -05:00

cq.h

mlx4_core: Add ethernet fields to CQE struct

2008-08-06 20:14:06 -07:00

device.h

Merge branches 'misc' and 'mlx4' into for-next

2012-03-12 16:25:28 -07:00

doorbell.h

…

driver.h

IB/mlx4: Handle protocol field in multicast table

2011-01-12 14:49:17 -08:00

qp.h

net/mlx4_en: adding loopback support

2011-11-27 17:17:04 -05:00

srq.h

…