David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
Kconfig	mvneta: add FIXED_PHY dependency	2015-11-09 11:35:03 -05:00
Makefile	ethernet: Add new driver for Marvell Armada 375 network unit	2014-07-10 17:18:24 -07:00
mv643xx_eth.c	net: mv643xx: Use platform_register/unregister_drivers()	2015-12-03 15:14:58 -05:00
mvmdio.c
mvneta.c	net: mvneta: Configure XPS support	2015-12-11 20:28:20 -05:00
mvpp2.c	net: mvpp2: fix refilling BM pools in RX path	2015-12-04 15:01:13 -05:00
pxa168_eth.c	pxa168: fix double deallocation of managed resources	2015-04-26 16:05:49 -04:00
skge.c	skge: Unmask interrupts in case of spurious interrupts	2014-12-05 21:33:19 -08:00
skge.h
sky2.c	net: Rename NETIF_F_ALL_CSUM to NETIF_F_CSUM_MASK	2015-12-15 16:50:08 -05:00
sky2.h