linux/drivers/net/ethernet
David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-08-30 00:54:02 -04:00
..
3com
8390
adaptec
adi net: bfin_mac: Fix a few spelling fixes 2016-08-13 15:14:56 -07:00
aeroflex net: ethernet: greth: use phy_ethtool_{get|set}_link_ksettings 2016-08-08 15:42:21 -07:00
agere
allwinner
alteon
altera
amazon net: ena: change the return type of ena_set_push_mode() to be void. 2016-08-23 17:42:33 -07:00
amd amd-xgbe: Reset running devices after resume from hibernate 2016-08-29 00:25:47 -04:00
apm net/xgene: fix error handling during reset 2016-08-29 00:29:46 -04:00
apple
arc net: arc_emac: add missing of_node_put() in arc_emac_probe() 2016-08-06 00:07:38 -04:00
atheros Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
aurora
broadcom Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
brocade bna: remove global bnad_list_mutex 2016-08-08 15:41:27 -07:00
cadence net: ethernet: macb: Add support for rx_clk 2016-08-18 20:58:42 -07:00
calxeda
cavium Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
chelsio cxgb4/cxgb4vf: fix spelling mistake "provissioned" -> "provisioned" 2016-08-28 23:41:46 -04:00
cirrus
cisco
davicom dm9000: Fix irq trigger type setup on non-dt platforms 2016-08-09 15:08:22 -07:00
dec net: fix up a few missing hashtable.h conflict resolutions 2016-08-13 14:51:02 -07:00
dlink
emulex be2net: replace polling with sleeping in the FW completion path 2016-08-08 15:38:27 -07:00
ezchip
faraday
freescale Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
fujitsu
hisilicon Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
hp
i825xx
ibm ibmvnic: fix error return code in ibmvnic_probe() 2016-08-25 16:41:00 -07:00
intel Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
marvell net: ethernet: marvell: mvneta: use new api ethtool_{get|set}_link_ksettings 2016-08-08 15:42:21 -07:00
mediatek net: ethernet: mediatek: modify GDM to send packets to the PDMA for RX 2016-08-26 21:06:58 -07:00
mellanox Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
micrel
microchip
moxa
myricom
natsemi
neterion
netronome
nuvoton net: ethernet: nuvoton: fix spelling mistake: "aligment" -> "alignment" 2016-08-18 23:29:43 -07:00
nvidia
nxp net: lpc_eth: Check clk_prepare_enable() error 2016-08-23 17:10:16 -07:00
oki-semi
packetengines
pasemi
qlogic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
qualcomm
rdc
realtek 8139cp: Fix one possible deadloop in cp_rx_poll 2016-08-25 17:02:48 -07:00
renesas net: ethernet: renesas: ravb: use new api ethtool_{get|set}_link_ksettings 2016-08-20 22:27:17 -07:00
rocker bridge: switchdev: Add forward mark support for stacked devices 2016-08-26 13:13:36 -07:00
samsung
seeq
sfc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
sgi
silan
sis
smsc net: smc91x: fix SMC accesses 2016-08-28 23:44:55 -04:00
stmicro ethernet: stmicro: stmmac: add missing of_node_put after calling of_parse_phandle 2016-08-01 21:43:49 -07:00
sun
synopsys dwc_eth_qos: fix interrupt enable race 2016-08-23 17:11:05 -07:00
tehuti net: tehuti: fix typo: "eneble" -> "enable" 2016-08-21 15:21:36 -07:00
ti net: ethernet: ti: cpsw: fix error return code in cpsw_set_channels() 2016-08-26 21:49:41 -07:00
tile
toshiba
tundra net/ethernet: tundra: fix dump_eth_one warning in tsi108_eth 2016-08-08 13:08:21 -07:00
via
wiznet
xilinx net: xilinx: emaclite: Fallback to random MAC address. 2016-08-20 22:11:29 -07:00
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig net: ena: Add a driver for Amazon Elastic Network Adapters (ENA) 2016-08-12 17:12:08 -07:00
korina.c
lantiq_etop.c
Makefile net: ena: Add a driver for Amazon Elastic Network Adapters (ENA) 2016-08-12 17:12:08 -07:00
netx-eth.c