iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/net/ethernet
History
David S. Miller 902455e007 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/core/rtnetlink.c
	net/core/skbuff.c

Both conflicts were very simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-11 16:02:55 -07: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
bfin_mac: remove empty MDIO bus reset function
2014-03-28 01:38:02 -04:00
aeroflex
net: greth: remove empty MDIO bus reset function
2014-03-28 01:38:01 -04:00
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
amd-xgbe: unwind on error in xgbe_mdio_register()
2014-06-11 15:39:19 -07:00
apple
macmace: add missing platform_set_drvdata() in mace_probe()
2013-11-11 14:02:08 -05:00
arc
arc_emac: add netpoll support
2014-05-13 18:02:24 -04:00
atheros
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
broadcom
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
brocade
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07: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
cxgb4: Change default Interrupt Holdoff Packet Count Threshold
2014-06-10 22:49:55 -07:00
cirrus
cs89x0: Call dev_consume_skb_any instead of dev_kfree_skb.
2014-03-24 21:18:58 -07:00
cisco
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
davicom
dm9000: avoid sleeping in dm9000_timeout callback
2014-06-05 15:12:11 -07:00
dec
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
dlink
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
emulex
Merge branch 'ethtool-rssh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/net-next
2014-06-02 23:07:02 -07:00
faraday
net: get rid of SET_ETHTOOL_OPS
2014-05-13 17:43:20 -04:00
freescale
net/fsl: xgmac_mdio is dependent on OF_MDIO
2014-06-11 15:50:59 -07:00
fujitsu
net: get rid of SET_ETHTOOL_OPS
2014-05-13 17:43:20 -04:00
hisilicon
net: hisilicon: add hix5hd2 mac driver
2014-06-02 23:39:05 -07:00
hp
…
i825xx
i825xx: Call dev_kfree_skb_any instead of dev_kfree_skb.
2014-03-24 21:19:02 -07:00
ibm
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
icplus
net: get rid of SET_ETHTOOL_OPS
2014-05-13 17:43:20 -04:00
intel
i40e/i40evf: Bump i40e to version 0.4.10 and i40evf to 0.9.34
2014-06-11 08:48:43 -07:00
marvell
net: mv643xx_eth: Avoid unmapping the TSO header buffers
2014-06-02 16:16:06 -07:00
mellanox
net/mlx4_en: Use affinity hint
2014-06-11 14:58:16 -07:00
micrel
net: ks8851: Don't use regulator_get_optional()
2014-06-02 00:13:51 -07:00
microchip
net: get rid of SET_ETHTOOL_OPS
2014-05-13 17:43:20 -04:00
moxa
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
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
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
nuvoton
…
nvidia
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
nxp
lpc_eth: Use resource_size instead of computation
2014-06-03 16:08:52 -07:00
octeon
Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 07:55:21 +09:00
oki-semi
net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate
2014-06-06 16:24:07 -07:00
packetengines
net: get rid of SET_ETHTOOL_OPS
2014-05-13 17:43:20 -04:00
pasemi
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
qlogic
qlcnic: Update version to 5.3.60
2014-06-11 15:44:29 -07:00
rdc
r6040: remove empty MDIO bus reset function
2014-03-28 01:38:02 -04:00
realtek
net: get rid of SET_ETHTOOL_OPS
2014-05-13 17:43:20 -04:00
renesas
net: sh_eth: Fix timing of RACT setting in sh_eth_rx()
2014-06-11 15:15:31 -07:00
samsung
net: sxgbe: remove duplicate SXGBE_CORE_L34_ADDCTL_REG define
2014-06-11 15:01:30 -07:00
seeq
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
sfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-06-11 16:02:55 -07:00
sgi
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
silan
sc92031: Call dev_consume_skb_any instead of dev_kfree_skb.
2014-03-24 21:19:08 -07:00
sis
net: get rid of SET_ETHTOOL_OPS
2014-05-13 17:43:20 -04:00
smsc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-06-03 23:32:12 -07:00
stmicro
net: stmmac: Handle different error codes from platform_get_irq_byname
2014-06-02 14:04:06 -07: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
drivers: net: davinci_cpdma: double free on error
2014-06-11 15:39:19 -07:00
tile
net: tile: Remove unnecessary memset of netdev private data
2014-05-30 17:06:23 -07:00
toshiba
net: ethernet: toshiba: ps3_gelic_net.c: Cleaning up a check on a memory allocation
2014-06-11 00:13:16 -07:00
tundra
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
via
net: via-rhine: Convert #ifdef USE_MMIO to a runtime flag
2014-05-05 15:36:41 -04:00
wiznet
net: w5100: Use devm_ioremap_resource()
2014-02-28 16:57:24 -05:00
xilinx
xilinx: Use time_before_eq()
2014-05-22 15:50:13 -04:00
xircom
ethernet: Fix FSF address in file headers
2013-12-06 12:37:55 -05:00
xscale
net: ptp: move PTP classifier in its own file
2014-04-01 16:43:18 -04:00
dnet.c
dnet: remove empty MDIO bus reset function
2014-03-28 01:38:02 -04:00
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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-06-03 23:32:12 -07:00
korina.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
lantiq_etop.c
netdevice: add queue selection fallback handler for ndo_select_queue
2014-02-17 00:36:34 -05:00
Makefile
net: hisilicon: add hix5hd2 mac driver
2014-06-02 23:39:05 -07:00
netx-eth.c
ethernet: Fix FSF address in file headers
2013-12-06 12:37:55 -05:00
s6gmac.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00