[commits] [batman-adv] master: Merge branch 'maint' (66a1f2a)

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

On branch : master

commit 66a1f2a973ec0e5d24a00b5ca552630719586d5f Merge: 68e1946 e08aac0 Author: Sven Eckelmann sven@narfation.org Date: Tue Jan 23 13:13:02 2018 +0100

Merge branch 'maint'

66a1f2a973ec0e5d24a00b5ca552630719586d5f compat-include/linux/average.h | 8 +++++--- compat-include/linux/{seq_file.h => compiler.h} | 20 ++++++++++---------- net/batman-adv/fragmentation.c | 3 ++- net/batman-adv/soft-interface.c | 8 +------- 4 files changed, 18 insertions(+), 21 deletions(-)