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

On branches: master,next

commit 01e5b859b7ce3c779e52070dc45b845c5b052561 Merge: 801d51e fcf6a3a Author: Sven Eckelmann sven@narfation.org Date: Tue Oct 18 13:03:05 2016 +0200

Merge branch 'maint' into next

01e5b859b7ce3c779e52070dc45b845c5b052561 net/batman-adv/log.h | 2 +- net/batman-adv/originator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)