David S. Miller c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-27 15:43:10 -04:00
..
cmd.h
cq.h	net/mlx5_core: Fix trimming down IRQ number	2016-01-17 12:08:04 -05:00
device.h	net/mlx5e: Fix checksum handling for non-stripped vlan packets	2016-04-26 15:58:03 -04:00
doorbell.h
driver.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-27 15:43:10 -04:00
fs.h	net/mlx5_core: Introduce forward to next priority action	2016-03-10 09:22:06 -05:00
mlx5_ifc.h	net/mlx5: Update mlx5_ifc hardware features	2016-04-15 17:21:10 -04:00
port.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-27 15:43:10 -04:00
qp.h	net/mlx5: Introduce device queue counters	2016-04-21 15:09:04 -04:00
srq.h
transobj.h	IB/mlx5: Support setting Ethernet priority for Raw Packet QPs	2016-01-21 12:01:09 -05:00
vport.h	net/mlx5e: Use vport MTU rather than physical port MTU	2016-04-24 14:51:39 -04:00