proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-07 18:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
d893665728
mirror_ubuntu-kernels/net/dsa
History
David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-26 16:08:27 -07:00
..
dsa_priv.h net: dsa: Add netconsole support 2015-07-31 15:45:37 -07:00
dsa.c net: fix net_device refcounting 2015-09-24 23:04:53 -07:00
Kconfig net: dsa: make NET_DSA manually selectable from the config 2015-03-20 21:37:58 -04:00
Makefile net: dsa: add Broadcom tag RX/TX handler 2014-08-27 22:59:40 -07:00
slave.c net: dsa: Set a "dsa" device_type 2015-09-25 12:25:16 -07:00
tag_brcm.c net: dsa: Refactor transmit path to eliminate duplication 2015-07-31 15:45:37 -07:00
tag_dsa.c net: dsa: Refactor transmit path to eliminate duplication 2015-07-31 15:45:37 -07:00
tag_edsa.c net: dsa: Refactor transmit path to eliminate duplication 2015-07-31 15:45:37 -07:00
tag_trailer.c net: dsa: Fix Marvell Egress Trailer check 2015-09-22 17:37:03 -07:00