Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
56a4342dfe
linux/drivers/net/hyperv
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
..
hyperv_net.h drivers/net/*: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
Kconfig
Makefile
netvsc_drv.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
netvsc.c drivers/net/*: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
rndis_filter.c drivers/net/*: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00