David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
3com	drivers/net: Use setup_timer and mod_timer	2015-02-11 19:40:12 -08:00
8390	net:treewide: Fix typo in drivers/net	2015-04-27 13:40:53 -04:00
adaptec
adi	ptp: blackfin: use helpers for converting ns to timespec.	2015-03-31 17:19:19 -04:00
aeroflex	net: greth: constify of_device_id array	2015-03-17 15:00:22 -04:00
agere	et131x: use msecs_to_jiffies for conversions	2015-02-11 19:37:43 -08:00
allwinner	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
alteon
altera	altera_tse: Correct rx packet length	2015-04-29 15:19:34 -04:00
amd	net: amd-xgbe: Add hardware dependency	2015-05-09 16:24:15 -04:00
apm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
apple	powerpc updates for 4.1	2015-04-16 13:53:32 -05:00
arc	ethernet: arc: ARC_EMAC and EMAC_ROCKCHIP should depend on HAS_DMA	2015-04-23 14:09:58 -04:00
atheros	trivial: net: atl1e: atl1e_hw.h: fix 0x0x prefix	2015-04-29 14:56:39 -04:00
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
brocade	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
cadence	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
calxeda	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
chelsio	cxgb4/cxgb4vf: Cleanup macros, add comments and add new MACROS	2015-05-12 23:11:40 -04:00
cirrus	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
cisco	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
davicom
dec	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
dlink
emulex	be2net: update the driver version to 10.6.0.2	2015-05-09 16:27:04 -04:00
faraday
freescale	net: fec: add support of ethtool get_regs	2015-05-11 14:09:36 -04:00
fujitsu
hisilicon	hisilicon: Replace put_page(virt_to_head_page()) with skb_free_frag()	2015-05-12 10:39:27 -04:00
hp
i825xx
ibm	ibmveth: Add support for Large Receive Offload	2015-04-30 16:33:46 -04:00
icplus
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
marvell	mvneta: Replace put_page(virt_to_head_page(ptr)) w/ skb_free_frag	2015-05-12 10:39:27 -04:00
mellanox	net/mlx4_core: Work properly with EQ numbers > 256 in SRIOV	2015-05-05 19:39:12 -04:00
micrel	ethernet: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
microchip
moxa	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
myricom	ethernet: myri10ge: use arch_phys_wc_add()	2015-04-23 14:28:14 -04:00
natsemi
neterion	s2io: Update driver to use dma_wmb	2015-04-08 12:15:14 -04:00
nuvoton
nvidia
nxp
octeon	netdev: octeon_mgmt: constify of_device_id array	2015-03-17 15:00:22 -04:00
oki-semi	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
packetengines	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
pasemi	net: pasemi: Use setup_timer and mod_timer	2015-03-01 13:40:23 -05:00
qlogic	netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2)	2015-05-09 16:44:46 -04:00
qualcomm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
rdc
realtek	r8169: Do not use dev_kfree_skb in xmit path	2015-05-04 00:06:55 -04:00
renesas	sh_eth: Mitigate lost statistics updates	2015-03-04 15:40:54 -05:00
rocker	switchdev: don't use anonymous union on switchdev attr/obj structs	2015-05-13 14:20:59 -04:00
samsung	ethernet: codespell comment spelling fixes	2015-03-08 22:54:22 -04:00
seeq
sfc	sfc: Bind the sfc driver to any available VF's	2015-05-09 16:16:48 -04:00
sgi
silan
sis
smsc	Revert "Revert "smc91x: retrieve IRQ and trigger flags in a modern way""	2015-05-04 15:12:33 -04:00
stmicro	drivers/net: include <module.h> for modular stmmac_platform code	2015-05-03 23:40:09 -04:00
sun	sungem, sunhme, sunvnet: Update drivers to use dma_wmb/rmb	2015-04-08 12:15:14 -04:00
tehuti
ti	netcp: Replace put_page(virt_to_head_page(ptr)) w/ skb_free_frag	2015-05-12 10:39:26 -04:00
tile	This is the final removal (after several years!) of the obsolete cpus_*	2015-04-20 10:19:03 -07:00
toshiba	toshiba: Remove celleb from Kconfig options	2015-04-14 14:57:10 -04:00
tundra
via	via-rhine: close SMP transmit races.	2015-05-04 00:18:27 -04:00
wiznet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-20 18:51:09 -04:00
xilinx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
xircom
xscale	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
dnet.c
dnet.h
ec_bhf.c
ethoc.c	net: ethoc: constify of_device_id array	2015-03-17 15:00:21 -04:00
fealnx.c
jme.c
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c