David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -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	net: mvmdio: Use devm_* API to simplify the code	2014-05-23 15:31:49 -04:00
mvneta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
mvpp2.c	net: mvpp2: replace TX coalescing interrupts with hrtimer	2015-08-10 10:57:00 -07: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	RESEND: [PATCH v3 net-next] sky2: use random address if EEPROM is bad	2015-09-29 15:00:04 -07:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00