AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-27 03:45:28 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
37c0ffaad2
linux_dsm_epyc7002/drivers/net/ethernet/via
History
David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-25 20:29:20 -04:00
..
Kconfig net: Move MII out from under NET_CORE and hide it 2013-06-19 22:22:56 -07:00
Makefile
via-rhine.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-25 20:29:20 -04:00
via-velocity.c via-velocity: Call dev_kfree_skb_any instead of kfree_skb. 2014-03-24 21:19:22 -07:00
via-velocity.h net: velocity: Add platform device support to VIA velocity driver 2013-05-20 13:40:39 -07:00