David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
epic100.c	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
Kconfig	net: smsc: Add support h8300	2016-01-15 15:14:23 -05:00
Makefile
smc91c92_cs.c	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
smc91x.c	net: smc91x: fix SMC accesses	2016-08-28 23:44:55 -04:00
smc91x.h	net: smsc: remove build warning of duplicate definition	2016-09-06 13:44:33 -07:00
smc911x.c	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
smc911x.h	net: smc911x: convert pxa dma to dmaengine	2016-03-18 22:23:59 -04:00
smc9194.c	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
smc9194.h
smsc911x.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
smsc911x.h	smsc: replace WARN_ON() with WARN_ON_SMP()	2014-08-11 14:38:29 -07:00
smsc9420.c	net: ethernet: smsc9420: use phy_ethtool_{get|set}_link_ksettings	2016-07-15 16:41:35 -07:00
smsc9420.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00