David S. Miller 55b42b5ca2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/marvell.c Simple overlapping changes in drivers/net/phy/marvell.c Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-01 14:53:27 -04:00
..
dsa.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-01 14:53:27 -04:00
dsa_priv.h	net: dsa: allow switch drivers to implement suspend/resume hooks	2014-09-22 14:41:23 -04:00
Kconfig	net: dsa: Add support for reporting switch chip temperatures	2014-10-30 14:54:11 -04:00
Makefile	net: dsa: add Broadcom tag RX/TX handler	2014-08-27 22:59:40 -07:00
slave.c	net: dsa: Add support for reading switch registers with ethtool	2014-10-30 14:54:11 -04:00
tag_brcm.c	dsa: Split ops up, and avoid assigning tag_protocol and receive separately	2014-09-15 17:24:20 -04:00
tag_dsa.c	net: dsa: Don't set skb->protocol on outgoing tagged packets	2014-10-30 14:54:10 -04:00
tag_edsa.c	net: dsa: Don't set skb->protocol on outgoing tagged packets	2014-10-30 14:54:10 -04:00
tag_trailer.c	net: dsa: Don't set skb->protocol on outgoing tagged packets	2014-10-30 14:54:10 -04:00