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	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile	Renesas Ethernet AVB PTP clock driver	2015-06-11 00:24:12 -07:00
ravb.h	ravb: ptp: Add CONFIG mode support	2015-12-03 14:28:26 -05:00
ravb_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-03 21:09:12 -05:00
ravb_ptp.c	renesas: missing unlock on error path	2015-06-25 02:13:02 -07:00
sh_eth.c	sh_eth: Remove obsolete r8a777x-ether platform_device_id entry	2015-11-24 16:48:17 -05:00
sh_eth.h	sh_eth: fix typo in RX descriptor bit name	2015-11-02 23:01:06 -05:00