David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
3com
8390
adaptec
adi
aeroflex
agere	net: ethernet: et131x: constify ethtool_ops structures	2016-08-31 09:22:30 -07:00
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	xgbe: constify get_netdev_ops and get_ethtool_ops	2016-08-31 14:17:30 -07:00
apm	net: xgene: fix backward compatibility fix	2016-09-01 10:00:42 -07:00
apple
arc	net: arc_emac: mark arc_mdio_reset() static	2016-09-06 15:58:59 -07:00
atheros	alx: add module parameter to enable msi-x support	2016-09-09 20:51:22 -07:00
aurora
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
brocade
cadence	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
calxeda
cavium	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
chelsio	cxgb4: Add support for ndo_get_vf_config	2016-09-04 11:46:00 -07:00
cirrus
cisco
davicom
dec
dlink
emulex	be2net: Update the driver version to 11.1.0.0	2016-09-07 22:44:56 -07:00
ezchip
faraday
freescale	net: fs_enet: make rx_copybreak value configurable	2016-09-10 21:17:14 -07:00
fujitsu
hisilicon	net: hisilicon: constify ethtool_ops structures	2016-08-31 09:22:31 -07: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-09-12 15:52:44 -07:00
marvell	sky2: use napi_complete_done	2016-09-01 14:09:51 -07:00
mediatek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
mellanox	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
micrel
microchip
moxa
myricom
natsemi
neterion
netronome	nfp: don't pad frames on receive	2016-09-08 17:18:42 -07:00
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-09-12 15:52:44 -07:00
qualcomm	net: emac: emac gigabit ethernet controller driver	2016-09-01 23:32:05 -07:00
rdc
realtek	8139cp: Fix one possible deadloop in cp_rx_poll	2016-08-25 17:02:48 -07:00
renesas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
rocker	bridge: switchdev: Add forward mark support for stacked devices	2016-08-26 13:13:36 -07:00
samsung
seeq
sfc	sfc: check MTU against minimum threshold	2016-09-06 16:54:18 -07:00
sgi
silan
sis
smsc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
stmicro	net: stmmac: dwmac-rk: add pd_gmac support for rk3399	2016-09-02 17:08:57 -07:00
sun
synopsys	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
tehuti	net: tehuti: fix typo: "eneble" -> "enable"	2016-08-21 15:21:36 -07:00
ti	net: ti: cpmac: Fix compiler warning due to type confusion	2016-09-04 11:47:20 -07:00
tile
toshiba
tundra
via	via-velocity: remove null pointer check on array tdinfo->skb_dma	2016-09-09 18:17:33 -07:00
wiznet
xilinx	net: ethernet: xilinx: Enable emaclite for MIPS	2016-09-08 16:06:37 -07:00
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c