David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
dsa_priv.h	net: dsa: integrate with SWITCHDEV for HW bridging	2015-02-25 17:03:38 -05:00
dsa.c	net: dsa: Properly propagate errors from dsa_switch_setup_one	2015-05-31 21:50:34 -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	switchdev: don't use anonymous union on switchdev attr/obj structs	2015-05-13 14:20:59 -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