David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
bat_algo.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_algo.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_iv_ogm.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_iv_ogm.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_v_elp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
bat_v_elp.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_v_ogm.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_v_ogm.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_v.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bat_v.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bitarray.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bitarray.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bridge_loop_avoidance.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
bridge_loop_avoidance.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
debugfs.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
debugfs.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
distributed-arp-table.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
distributed-arp-table.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
fragmentation.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
fragmentation.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
gateway_client.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
gateway_client.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
gateway_common.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
gateway_common.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
hard-interface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
hard-interface.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
hash.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
hash.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
icmp_socket.c	This feature/cleanup patchset includes the following patches:	2019-02-01 11:04:13 -08:00
icmp_socket.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
Kconfig	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
log.c	This feature/cleanup patchset includes the following patches:	2019-02-01 11:04:13 -08:00
log.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
main.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
main.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
Makefile	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
multicast.c	This feature/cleanup patchset includes the following patches:	2019-02-01 11:04:13 -08:00
multicast.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
netlink.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
netlink.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
network-coding.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
network-coding.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
originator.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
originator.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
routing.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
routing.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
send.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
send.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
soft-interface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
soft-interface.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
sysfs.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
sysfs.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
tp_meter.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
tp_meter.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
trace.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
trace.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
translation-table.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
translation-table.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
tvlv.c	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
tvlv.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00
types.h	batman-adv: Update copyright years for 2019	2019-01-04 11:04:24 +01:00