[commits] [batman-adv] master: Merge branch 'maint' (1b6c40c)

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

On branch : master

commit 1b6c40c9d6df743997427a77976f40dbf981241a Merge: 5283463 eb84f4e Author: Sven Eckelmann sven@narfation.org Date: Tue Mar 7 17:01:14 2017 +0100

Merge branch 'maint'

1b6c40c9d6df743997427a77976f40dbf981241a CHANGELOG | 10 ++++++ compat-include/linux/average.h | 67 +++++++++++++++++++++++++++-------------- net/batman-adv/bat_iv_ogm.c | 11 +++++++ net/batman-adv/bat_v.c | 14 +++++++-- net/batman-adv/gateway_common.c | 5 +++ net/batman-adv/soft-interface.c | 1 - net/batman-adv/types.h | 4 ++- 7 files changed, 84 insertions(+), 28 deletions(-)