AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 04:37:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
1414abea04
linux_dsm_epyc7002/drivers/net/ethernet/qlogic/netxen
History
David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 17:37:45 -05:00
..
Makefile ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic_ctx.c ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic_ethtool.c ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic_hdr.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic_hw.c net: netxen: slight optimization of addr compare 2013-12-31 16:48:32 -05:00
netxen_nic_hw.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic_init.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
netxen_nic_main.c ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00