David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/arp.c The net/ipv4/arp.c conflict was one commit adding a new local variable while another commit was deleting one. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-09-26 16:08:27 -07:00
..
3com
8390
adaptec
adi
aeroflex
agere
allwinner
alteon
altera	net: eth: altera: Fix the initial device operstate	2015-09-09 12:10:15 -07:00
amd
apm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
apple
arc	net: arc: Fix module autoload for OF platform driver	2015-09-21 16:08:20 -07:00
atheros
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
brocade	bna: check for dma mapping errors	2015-09-20 21:36:57 -07:00
cadence
calxeda
cavium	net: cavium: liquidio: use kzalloc in setup_glist()	2015-09-09 17:06:00 -07:00
chelsio	cxgb4: add device ID for few T5 adapters	2015-09-17 16:24:51 -07:00
cirrus
cisco
davicom	dm9000: fix a typo	2015-09-08 22:44:42 -07:00
dec
dlink
emulex	be2net: allow offloading with the same port for IPv4 and IPv6	2015-09-17 22:32:16 -07:00
ezchip
faraday
freescale	phy: add phy_device_remove()	2015-09-24 23:04:53 -07:00
fujitsu
hisilicon	net: add Hisilicon Network Subsystem basic ethernet support	2015-09-20 21:42:58 -07:00
hp
i825xx
ibm	net/ibm/emac: fix type of phy_mode	2015-09-22 16:14:31 -07:00
icplus
intel	ixgbe: Advance version to 4.2.1	2015-09-23 23:09:34 -07:00
marvell	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
mellanox	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 06:01:33 -04:00
micrel	net: ks8851: Export OF module alias information	2015-09-17 21:24:02 -07:00
microchip
moxa	net: moxa: Fix module autoload for OF platform driver	2015-09-21 16:09:02 -07:00
myricom
natsemi
neterion
nuvoton
nvidia
nxp
octeon
oki-semi
packetengines
pasemi
qlogic	qlcnic: track vxlan port count	2015-09-17 22:32:16 -07:00
qualcomm
rdc
realtek	8139cp: Dump contents of descriptor ring on TX timeout	2015-09-23 14:47:13 -07:00
renesas
rocker	rocker: use switchdev transaction queue for allocated memory	2015-09-24 22:59:22 -07:00
samsung
seeq
sfc
sgi
silan
sis
smsc	net: smc91x: convert pxa dma to dmaengine	2015-09-17 13:36:52 -07:00
stmicro	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
sun	sunvnet: Invoke SET_NETDEV_DEV() to set up the vdev in vnet_new()	2015-09-21 16:28:36 -07:00
synopsys	ethernet: synopsys: SYNOPSYS_DWC_ETH_QOS should depend on HAS_DMA	2015-09-06 19:48:53 -07:00
tehuti
ti	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
tile
toshiba
tundra
via	net: via/Kconfig: GENERIC_PCI_IOMAP required if PCI not selected	2015-09-25 12:36:58 -07:00
wiznet
xilinx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
xircom
xscale
dnet.c
dnet.h
ec_bhf.c
ethoc.c	net/ethoc: support big-endian register layout	2015-09-23 15:33:15 -07:00
fealnx.c
jme.c	net: jme: use kzalloc() instead of kmalloc+memset	2015-09-09 17:06:00 -07:00
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c