David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
mvpp2	net: mvpp2: fix the phylink mode validation	2018-12-19 16:38:35 -08:00
octeontx2	octeontx2-af: Enable mkex profile	2018-12-03 16:23:08 -08:00
Kconfig	octeontx2-af: Add Marvell OcteonTX2 RVU AF driver	2018-10-10 10:06:01 -07:00
Makefile	octeontx2-af: Add Marvell OcteonTX2 RVU AF driver	2018-10-10 10:06:01 -07:00
mv643xx_eth.c	net: ethernet: Convert phydev advertize and supported from u32 to link mode	2018-11-11 10:10:01 -08:00
mvmdio.c	drivers: net: Remove device_node checks with of_mdiobus_register()	2018-05-16 14:20:36 -04:00
mvneta_bm.c	net: mvneta: remove data pointer usage from device_node structure	2018-07-28 22:12:55 -07:00
mvneta_bm.h	net: mvneta: Allocate page for the descriptor	2018-07-28 22:12:55 -07:00
mvneta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
pxa168_eth.c	net: phy: Replace phy driver features u32 with link_mode bitmap	2018-10-01 22:55:36 -07:00
skge.c	net: marvell: convert to DEFINE_SHOW_ATTRIBUTE	2018-12-03 17:33:44 -08:00
skge.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sky2.c	net: marvell: convert to DEFINE_SHOW_ATTRIBUTE	2018-12-03 17:33:44 -08:00
sky2.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00