David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
cmd.h	net/mlx4_en: Support ndo_get_vf_stats	2015-06-15 17:23:03 -07:00
cq.h	net/mlx4_en: Add support for hardware accelerated 802.1ad vlan	2015-07-27 15:00:37 -07:00
device.h	mlx4: Expose correct max_sge_rd limit	2015-12-08 12:42:44 -05:00
doorbell.h
driver.h	net/mlx4_core: Keep VLAN/MAC tables mirrored in multifunc HA mode	2015-12-06 22:40:45 -05:00
qp.h	net/mlx4_core: Add support for filtering multicast loopback	2015-10-21 23:16:47 -04:00
srq.h	mlx4_core: Implement SRQ object lookup from srqn	2013-04-16 22:42:55 -07:00