linux_dsm_epyc7002/drivers/net/ethernet/cavium/thunder
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
..
Makefile net: thunderx: Add RGMII interface type support 2016-08-13 11:59:31 -07:00
nic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
nic_reg.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
nic.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
nicvf_ethtool.c net: thunderx: Fix OOPs with ethtool --register-dump 2016-08-18 21:16:37 -07:00
nicvf_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
nicvf_queues.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
nicvf_queues.h net: thunderx: Set queue count based on number of CPUs 2016-08-13 11:59:30 -07:00
q_struct.h net: thunderx: HW TSO support for pass-2 hardware 2015-12-11 23:38:17 -05:00
thunder_bgx.c net: thunderx: Don't set RX_PACKET_DIS while initializing 2016-08-13 11:59:33 -07:00
thunder_bgx.h net: thunderx: Support for 83xx mixed QLM/DLM config 2016-08-13 11:59:31 -07:00
thunder_xcv.c net: thunderx: Remove unnecessary pci_set_drvdata() 2016-08-15 16:16:11 -07:00