alistair23-linux/include/linux/mlx5
David S. Miller cba6532100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-04 00:52:29 -04:00
..
cmd.h
cq.h
device.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
doorbell.h
driver.h net/mlx5: Initializing CPU reverse mapping 2016-04-29 16:29:11 -04:00
fs.h net/mlx5: Add user chosen levels when allocating flow tables 2016-04-29 16:29:09 -04: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
vport.h net/mlx5e: Use vport MTU rather than physical port MTU 2016-04-24 14:51:39 -04:00