David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
e1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-09 17:41:41 -04:00
e1000e	e1000e: fix PTP on e1000_pch_lpt variants	2016-08-16 10:47:20 -07:00
fm10k	fm10k: don't re-map queues when a mailbox message suffices	2016-08-29 01:31:03 -07:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
i40evf	i40evf: Open RDMA Client after reset	2016-08-19 21:57:19 -07:00
igb	igb: fix error code in igb_add_ethtool_nfc_entry()	2016-08-18 22:27:48 -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: Eliminate useless message and improve logic	2016-08-30 22:12:35 -07:00
ixgbevf	ixgbevf: fix incorrect MAC address on load	2016-08-20 19:41:21 -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