David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
Kconfig	sh_eth, ravb: Use ARCH_RENESAS	2016-03-03 17:09:08 -05:00
Makefile	Renesas Ethernet AVB PTP clock driver	2015-06-11 00:24:12 -07:00
ravb.h	ravb: make ravb_ptp_interrupt() *void*	2016-04-14 00:48:33 -04:00
ravb_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
ravb_ptp.c	ravb: make ravb_ptp_interrupt() *void*	2016-04-14 00:48:33 -04:00
sh_eth.c	sh_eth: re-enable-E-MAC interrupts in sh_eth_set_ringparam()	2016-04-09 21:27:04 -04:00
sh_eth.h	sh_eth: remove EDMAC_BIG_ENDIAN	2016-01-04 16:11:11 -05:00