[commits] [batman-adv] main,main: Merge branch 'stable' (ed12d0c1)

Repository : ssh://git@diktynna/batman-adv On branches: main,main

commit ed12d0c16556942c4fd52af122030182c11e60ef Merge: f779cdaf 2745af59 Author: Sven Eckelmann sven@narfation.org Date: Fri Jul 28 15:45:46 2023 +0200

Merge branch 'stable'

ed12d0c16556942c4fd52af122030182c11e60ef net/batman-adv/bat_v_elp.c | 3 ++- net/batman-adv/bat_v_ogm.c | 3 ++- net/batman-adv/hard-interface.c | 14 +++++++++++++- net/batman-adv/soft-interface.c | 3 +++ net/batman-adv/types.h | 6 ++++++ 5 files changed, 26 insertions(+), 3 deletions(-)