linux_dsm_epyc7002/drivers/net/ethernet
David S. Miller cba6532100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-04 00:52:29 -04:00
..
3com
8390
adaptec
adi
aeroflex
agere
allwinner
alteon
altera
amd drivers: net: use NETDEV_TX_OK instead of NETDEV_TX_LOCKED 2016-04-26 15:53:05 -04:00
apm drivers: net: xgene: constify xgene_cle_ops structure 2016-05-03 13:03:05 -04:00
apple
arc
atheros atle1: remove LLTX support and TX_UNLOCKED 2016-04-26 15:53:04 -04:00
aurora
broadcom Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
brocade
cadence Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
calxeda
cavium net: thunderx: Fix broken of_node_put() code. 2016-04-13 23:06:31 -04:00
chelsio Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
cirrus
cisco enic: set netdev->vlan_features 2016-04-18 14:53:21 -04:00
davicom
dec drivers: net: use NETDEV_TX_OK instead of NETDEV_TX_LOCKED 2016-04-26 15:53:05 -04:00
dlink
emulex benet: be_resume needs to protect be_open with rtnl_lock 2016-04-21 15:35:07 -04:00
ezchip
faraday
freescale net: ethernet: fec_mpc52xx: move to new ethtool api {get|set}_link_ksettings 2016-05-03 13:03:53 -04:00
fujitsu
hisilicon net: hns: change port-id property to reg property in dsaf port node 2016-04-29 13:39:03 -04:00
hp
i825xx
ibm ibmvnic: Enable use of multiple tx/rx scrqs 2016-04-09 00:02:41 -04:00
intel i40e/i40evf: Add support for GSO partial with UDP_TUNNEL_CSUM and GRE_CSUM 2016-05-01 17:05:16 -07:00
marvell net: mvneta: Remove superfluous SMP function call 2016-05-03 15:27:18 -04:00
mediatek net: mediatek: do not set the QID field in the TX DMA descriptors 2016-04-12 22:41:33 -04:00
mellanox Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
micrel
microchip net: ethernet: enc28j60: add device tree support 2016-04-29 16:23:02 -04:00
moxa
myricom myri10ge: fix sleeping with bh disabled 2016-04-28 14:21:14 -04:00
natsemi
neterion drivers: net: remove NETDEV_TX_LOCKED 2016-04-26 15:53:05 -04:00
netronome nfp: add async reconfiguration mechanism 2016-04-16 22:34:40 -04:00
nuvoton
nvidia
nxp
oki-semi pch_gbe: replace private tx ring lock with common netif_tx_lock 2016-04-28 17:19:58 -04:00
packetengines
pasemi
qlogic qed: Apply tunnel configurations after PF start 2016-05-03 15:48:32 -04:00
qualcomm
rdc
realtek
renesas ravb: Remove rx buffer ALIGN 2016-05-03 12:45:13 -04:00
rocker
samsung
seeq
sfc sfc: disable RSS when unsupported 2016-04-28 14:21:15 -04:00
sgi
silan
sis
smsc
stmicro stmmac: dwmac-socfpga: kill init() and rename setup() to set_phy_mode() 2016-05-03 15:22:20 -04:00
sun
synopsys
tehuti drivers: net: remove NETDEV_TX_LOCKED 2016-04-26 15:53:05 -04:00
ti Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
tile
toshiba ps3_gelic: fix memcpy parameter 2016-04-28 16:37:56 -04:00
tundra net: tsi108: use NULL for pointer-typed argument 2016-04-26 01:10:26 -04:00
via
wiznet net: w5100: support W5500 2016-04-27 21:55:45 -04:00
xilinx
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c drivers/net/ethernet/jme.c: Deinline jme_reset_mac_processor, save 2816 bytes 2016-04-13 22:57:00 -04:00
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c