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
..
alx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
atl1c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
atl1e	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
atlx	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile	alx: add a simple AR816x/AR817x device driver	2013-06-17 16:04:34 -07:00