David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -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
dsa.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
dsa_priv.h	net: dsa: Add netconsole support	2015-07-31 15:45:37 -07:00
slave.c	switchdev: remove pointers from switchdev objects	2015-10-15 06:09:49 -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