David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-15 13:32:48 -04:00
..
Kconfig	sh_eth, ravb: Use ARCH_RENESAS	2016-03-03 17:09:08 -05:00
Makefile
ravb_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
ravb_ptp.c	ravb: make ravb_ptp_interrupt() *void*	2016-04-14 00:48:33 -04:00
ravb.h	ravb: make ravb_ptp_interrupt() *void*	2016-04-14 00:48:33 -04:00
sh_eth.c	sh_eth: reuse sh_eth_chip_reset()	2016-05-09 00:15:23 -04:00
sh_eth.h	sh_eth: rename ARSTR register bit	2016-04-26 16:07:20 -04:00