[commits] [batman-adv] master: Merge branch 'maint' (0ac6431)

Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 0ac64311bff8ef760eef6499d3fa75e58c916aa1 Merge: b2eab52 acabad7 Author: Sven Eckelmann sven@narfation.org Date: Fri Sep 7 08:15:35 2018 +0200

Merge branch 'maint'

0ac64311bff8ef760eef6499d3fa75e58c916aa1 net/batman-adv/bat_v_elp.c | 8 ++++++-- net/batman-adv/bridge_loop_avoidance.c | 10 ++++++++-- net/batman-adv/gateway_client.c | 11 +++++++++-- net/batman-adv/network-coding.c | 27 +++++++++++++++------------ net/batman-adv/soft-interface.c | 25 ++++++++++++++++++------- net/batman-adv/translation-table.c | 6 ++++-- net/batman-adv/tvlv.c | 8 ++++++-- 7 files changed, 66 insertions(+), 29 deletions(-)