David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
mvpp2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
octeontx2	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	octeontx2-af: Add Marvell OcteonTX2 RVU AF driver	2018-10-10 10:06:01 -07:00
mv643xx_eth.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
mvmdio.c	drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case	2019-08-05 13:30:48 -07:00
mvneta_bm.c	net: hwbm: Make the hwbm_pool lock a mutex	2019-06-09 19:40:10 -07:00
mvneta_bm.h	net: mvneta: Allocate page for the descriptor	2018-07-28 22:12:55 -07:00
mvneta.c	net: mvneta: use devm_platform_ioremap_resource() to simplify code	2019-07-25 17:28:11 -07:00
pxa168_eth.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
skge.c	net: marvell: Use dev_get_drvdata where possible	2019-07-24 11:44:46 -07: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07: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