David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
3com	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
8390	net: 8390: use time_after() for time comparison	2014-05-18 21:24:52 -04:00
adaptec	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
adi
aeroflex
allwinner	net: sun4i-emac: add promiscuous support	2014-04-12 01:59:38 -04:00
alteon	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
altera	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
amd	net/ariadne: delete unneeded call to netdev_priv	2014-05-15 16:57:47 -04:00
apple
arc	arc_emac: add netpoll support	2014-05-13 18:02:24 -04:00
atheros	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
brocade	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
cadence	net: macb: Fix race between HW and driver	2014-05-05 17:11:18 -04:00
calxeda	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
chelsio	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
cirrus
cisco	enic: Add support for adaptive interrupt coalescing	2014-05-21 17:04:13 -04:00
davicom
dec	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
dlink	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
emulex	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
faraday	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
freescale	ucc_geth: use the new fixed PHY helpers	2014-05-22 15:16:44 -04:00
fujitsu	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
hp
i825xx
ibm	net: ethernet: ibm: ehea: ehea_qmr.c: Fix for possible null pointer dereference	2014-05-18 21:26:02 -04:00
icplus	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
intel	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next	2014-05-23 16:28:18 -04:00
marvell	net: mvneta: Remove unneeded 'weigth' field	2014-05-23 15:31:49 -04:00
mellanox	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
micrel	micrel: Use time_before_eq()	2014-05-22 15:50:12 -04:00
microchip	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
moxa
myricom	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
natsemi	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
neterion	vxge: Use time_before()	2014-05-21 16:42:30 -04:00
nuvoton
nvidia	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
nxp
octeon
oki-semi	net: pch_gbe depends on x86_32	2014-05-16 17:00:58 -04:00
packetengines	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
pasemi
qlogic	net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool.	2014-05-23 15:04:02 -04:00
rdc
realtek	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
renesas	sh_eth: replace devm_kzalloc() with devm_kmalloc_array()	2014-05-13 18:51:27 -04:00
samsung	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
seeq
sfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
sgi
silan
sis	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
smsc	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
stmicro	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
sun	net: cassini: use nested lock annotation	2014-05-09 16:34:10 -04:00
tehuti	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
ti	net: davinci_emac: fix oops caused by uninitialized ndev->dev	2014-05-22 15:22:36 -04:00
tile
toshiba
tundra
via	net: via-rhine: Convert #ifdef USE_MMIO to a runtime flag	2014-05-05 15:36:41 -04:00
wiznet
xilinx	xilinx: Use time_before_eq()	2014-05-22 15:50:13 -04:00
xircom
xscale	net: ptp: move PTP classifier in its own file	2014-04-01 16:43:18 -04:00
dnet.c
dnet.h
ec_bhf.c	driver/net/ethernet/ec_bhf.c: fix sparse warnings	2014-05-14 16:09:33 -04:00
ethoc.c	net: ethoc: remove ethoc_config	2014-04-21 14:58:48 -04:00
fealnx.c
jme.c	jme: Fix unmap loop counting error:	2014-05-14 15:11:22 -04:00
jme.h
Kconfig	Driver for Beckhoff CX5020 EtherCAT master module.	2014-05-08 22:59:25 -04:00
korina.c
lantiq_etop.c
Makefile	Driver for Beckhoff CX5020 EtherCAT master module.	2014-05-08 22:59:25 -04:00
netx-eth.c
s6gmac.c