AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 14:47:08 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
2364c5c5ec
linux_dsm_epyc7002/drivers/net/ethernet/cavium
History
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
..
liquidio liquidio:CN23XX pause frame support 2016-09-02 17:11:31 -07:00
octeon ethernet: cavium: octeon: add missing of_node_put after calling of_parse_phandle 2016-08-01 21:43:48 -07:00
thunder Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
Kconfig liquidio: CN23XX queue definitions 2016-08-31 14:12:47 -07:00
Makefile netdev: Move octeon/octeon_mgmt driver to cavium directory. 2016-03-18 18:25:30 -04:00