David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
Kconfig	ptp_clock: Allow for it to be optional	2016-11-16 09:26:34 +01:00
Makefile	Renesas Ethernet AVB PTP clock driver	2015-06-11 00:24:12 -07:00
ravb_main.c	ravb: remove erroneous comment	2018-03-07 10:40:14 -05:00
ravb_ptp.c	ravb: make ravb_ptp_interrupt() *void*	2016-04-14 00:48:33 -04:00
ravb.h	ravb: add support for changing MTU	2018-02-16 16:34:50 -05:00
sh_eth.c	sh_eth: fix typo in comment to BCULR write	2018-05-20 18:56:43 -04:00
sh_eth.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00