Repository : ssh://git@diktynna/batman-adv

On branch : master

commit e413c2483f96d83222c49b16e4a90f7db679df2e Merge: 529ea5b9 0631e082 Author: Sven Eckelmann sven@narfation.org Date: Sat Nov 13 11:20:20 2021 +0100

Merge branch 'maint' into netdev

e413c2483f96d83222c49b16e4a90f7db679df2e net/batman-adv/bridge_loop_avoidance.c | 8 +++-- net/batman-adv/main.c | 56 ++++++++++++++++++++++++---------- net/batman-adv/network-coding.c | 4 ++- net/batman-adv/translation-table.c | 4 ++- 4 files changed, 52 insertions(+), 20 deletions(-)