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

On branch : master

commit 058ce9614ea26328243925b69bf659ac543f420a Merge: 1e26904b 33e9de0c Author: Sven Eckelmann sven@narfation.org Date: Tue Jun 13 12:17:13 2017 +0200

Merge branch 'maint'

058ce9614ea26328243925b69bf659ac543f420a compat-include/linux/netdevice.h | 19 +++++++++++++++++++ net/batman-adv/soft-interface.c | 5 ++--- 2 files changed, 21 insertions(+), 3 deletions(-)