linux_dsm_epyc7002/drivers/net/ethernet/sun
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
2011-09-22 03:23:13 -04:00
..
cassini.c Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
cassini.h
Kconfig drivers/net/ethernet/*: Enabled vendor Kconfig options 2011-08-27 00:58:56 -07:00
Makefile net: Fix sungem_phy sharing. 2011-08-16 00:16:49 -07:00
niu.c ethtool: Update ethtool_rxnfc::rule_cnt on return from ETHTOOL_GRXCLSRLALL 2011-09-16 19:25:10 -04:00
niu.h
sunbmac.c sunbmac: use standard #defines from mii.h. 2011-08-25 11:08:21 +02:00
sunbmac.h sunbmac: use standard #defines from mii.h. 2011-08-25 11:08:21 +02:00
sungem.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sungem.h
sunhme.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sunhme.h
sunqe.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sunqe.h
sunvnet.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sunvnet.h