David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07:00
..
e1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-09 17:41:41 -04:00
e1000e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
fm10k	fm10k: Remove create_workqueue	2016-06-29 11:18:36 -07:00
i40e	i40e: Don't notify client(s) for DCB changes on all VSIs	2016-06-27 16:22:28 -07:00
i40evf	i40e/i40evf: Bump version from 1.5.16 to 1.6.4	2016-06-27 16:14:30 -07:00
igb	igb: Only DMA sync frame length	2016-06-29 13:59:24 -07:00
igbvf	intel: Add support for IPv6 IP-in-IP offload	2016-05-20 19:25:52 -04:00
ixgb	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
ixgbe	ixgbe: fix spoofed packets with macvlans	2016-06-29 13:06:31 -07:00
ixgbevf	ixgbevf: ixgbevf_write/read_posted_mbx should use IXGBE_ERR_MBX to initialize ret_val	2016-06-29 09:18:06 -07:00
e100.c	e100: Release skb when DMA mapping is failed in e100_xmit_prepare	2015-08-18 14:06:05 -07:00
Kconfig	ixgbe: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port	2016-06-17 20:23:30 -07:00
Makefile	fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver	2014-09-23 03:59:13 -07:00