David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
bat_algo.c
bat_algo.h
bat_iv_ogm.c	batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump	2018-06-23 10:29:33 +02:00
bat_iv_ogm.h	batman-adv: Unify include guards style	2018-07-07 22:02:17 +02:00
bat_v_elp.c	batman-adv: disable ethtool link speed detection when auto negotiation off	2018-05-14 09:30:57 +02:00
bat_v_elp.h
bat_v_ogm.c
bat_v_ogm.h	batman-adv: Unify include guards style	2018-07-07 22:02:17 +02:00
bat_v.c	batman-adv: Fix bat_v best gw refcnt after netlink dump	2018-06-23 10:29:33 +02:00
bat_v.h
bitarray.c
bitarray.h
bridge_loop_avoidance.c	net: drivers/net: Convert random_ether_addr to eth_random_addr	2018-06-23 10:49:14 +09:00
bridge_loop_avoidance.h
debugfs.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
debugfs.h	batman-adv: Fix debugfs path for renamed softif	2018-06-23 10:29:33 +02:00
distributed-arp-table.c
distributed-arp-table.h
fragmentation.c
fragmentation.h
gateway_client.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
gateway_client.h
gateway_common.c
gateway_common.h
hard-interface.c	batman-adv: Fix debugfs path for renamed softif	2018-06-23 10:29:33 +02:00
hard-interface.h
hash.c
hash.h
icmp_socket.c
icmp_socket.h
Kconfig	batman-adv: Remove "default n" in Kconfig	2018-06-23 10:30:06 +02:00
log.c
log.h
main.c
main.h	batman-adv: Start new development cycle	2018-04-22 09:29:14 +02:00
Makefile
multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
multicast.h
netlink.c
netlink.h
network-coding.c
network-coding.h
originator.c	batman-adv: Join batadv_purge_orig_ref and _batadv_purge_orig	2018-07-07 22:02:17 +02:00
originator.h
routing.c
routing.h
send.c
send.h
soft-interface.c	batman-adv: fix batadv_interface_tx()'s return type	2018-04-25 19:33:36 +02:00
soft-interface.h
sysfs.c
sysfs.h
tp_meter.c
tp_meter.h
translation-table.c	batman-adv: Fix multicast TT issues with bogus ROAM flags	2018-06-23 10:29:33 +02:00
translation-table.h
tvlv.c
tvlv.h
types.h	batman-adv: Convert batadv_dat_addr_t to proper type	2018-07-08 12:56:38 +02:00