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	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_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
ravb_ptp.c	renesas: missing unlock on error path	2015-06-25 02:13:02 -07:00
ravb.h	ravb: ptp: Add CONFIG mode support	2015-12-03 14:28:26 -05:00
sh_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
sh_eth.h	sh_eth: uninline sh_eth_{write|read}()	2015-12-14 16:25:21 -05:00