leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d247b6ab3c
linux/drivers/net/ethernet
History
David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/Makefile
	net/ipv6/sysctl_net_ipv6.c

Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.

In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-05 18:46:26 -07:00
..
3com
8390 8390: remove unnecessary break after return 2014-07-20 21:30:18 -07:00
adaptec
adi bfin_mac: convert bfin Ethernet driver to NAPI framework 2014-07-24 23:35:42 -07:00
aeroflex
allwinner net: sun4i-emac: fix memory leak on bad packet 2014-08-05 16:43:49 -07:00
alteon
altera Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-05-24 00:32:30 -04:00
amd amd-xgbe: Perform phy connect/disconnect at dev open/stop 2014-08-05 16:47:02 -07:00
apple
arc arc_emac: Remove unused pointer to net_device from arc_emac_priv 2014-07-09 16:49:21 -07:00
atheros atl1c: remove unnecessary break after return 2014-07-20 21:30:19 -07:00
broadcom Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-08-05 18:46:26 -07:00
brocade Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-08-05 18:46:26 -07:00
cadence net/macb: enable scatter-gather feature and set DMA burst length for sama5d4 gem 2014-07-24 23:39:55 -07:00
calxeda
chelsio cxgb4 : Disable recursive mailbox commands when enabling vi 2014-08-05 16:48:59 -07:00
cirrus cirrus: cs89x0: Use managed interfaces 2014-08-02 16:40:52 -07:00
cisco enic: Add ethtool support to show classifier filters added by the driver 2014-07-21 20:22:46 -07:00
davicom dm9000: NULL dereferences on error in probe() 2014-08-02 15:28:23 -07:00
dec net: tulip: remove unnecessary break after return 2014-07-20 21:30:18 -07:00
dlink net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate 2014-06-06 16:24:07 -07:00
emulex be2net: support deleting FW dump via ethtool (only for Lancer) 2014-08-02 15:59:18 -07:00
faraday
freescale net/fsl: Add format length modifier to avoid negative values 2014-07-30 19:58:09 -07:00
fujitsu
hisilicon net: hisilicon: add hix5hd2 mac driver 2014-06-02 23:39:05 -07:00
hp
i825xx
ibm net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate 2014-06-06 16:24:07 -07:00
icplus
intel i40evf: Fixed guest OS panic when removing vf driver 2014-08-02 19:41:15 -07:00
marvell net: mvpp2: implement ioctl() operation for PHY ioctls 2014-07-29 16:47:43 -07:00
mellanox mlx5: Adjust events to use unsigned long param instead of void * 2014-07-30 14:00:06 -07:00
micrel net: ks8851-ml: Use devm_ioremap_resource 2014-08-02 16:40:52 -07:00
microchip
moxa
myricom
natsemi
neterion vxge: remove deprecated syststamp timestamp 2014-07-29 11:39:49 -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 octeon: remove deprecated syststamp timestamp 2014-07-29 11:39:49 -07:00
oki-semi net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate 2014-06-06 16:24:07 -07:00
packetengines
pasemi
qlogic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-08-05 18:46:26 -07:00
rdc
realtek ethernet: realtek: use pci_device_id 2014-07-23 14:56:40 -07:00
renesas net: sh_eth: Add r8a7794 support 2014-08-02 16:38:32 -07:00
samsung net: sxgbe: remove duplicate SXGBE_CORE_L34_ADDCTL_REG define 2014-06-11 15:01:30 -07:00
seeq
sfc sfc: Use __iowrite64_copy instead of a slightly different local function 2014-07-29 15:30:29 -07:00
sgi
silan
sis sis900: remove unnecessary break after return 2014-07-20 21:30:18 -07:00
smsc net: smc911x: fix %d confusingly prefixed with 0x in format string 2014-08-05 13:04:32 -07:00
stmicro net: stmmac: Support devicetree configs for mcast and ucast filter entries 2014-07-31 14:13:29 -07:00
sun Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-07-30 13:25:49 -07:00
tehuti
ti drivers: net: cpsw: cleanup: remove unused function 2014-07-24 23:38:26 -07:00
tile net: set name_assign_type in alloc_netdev() 2014-07-15 16:12:48 -07:00
toshiba ps3_gelic: remove unnecessary break after return 2014-07-20 21:30:19 -07:00
tundra
via via-rhine: fix full-duplex with autoneg disable 2014-06-12 10:31:10 -07:00
wiznet
xilinx xilinx: Fix compiler warning 2014-06-22 17:14:56 -07:00
xircom
xscale
dnet.c net: dnet: Use managed interfaces 2014-08-02 16:40:52 -07:00
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c
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
lantiq_etop.c
Makefile net: hisilicon: add hix5hd2 mac driver 2014-06-02 23:39:05 -07:00
netx-eth.c
s6gmac.c