[commits] [batman-adv] master: Merge branch 'next' (26b9cae)

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

On branch : master

commit 26b9cae97d6cd00c185ad46db0e1a496c333935e Merge: 02e9463 a198a23 Author: Marek Lindner mareklindner@neomailbox.ch Date: Thu Apr 21 18:44:41 2016 +0800

Merge branch 'next'

26b9cae97d6cd00c185ad46db0e1a496c333935e net/batman-adv/originator.c | 16 +++++---------- net/batman-adv/translation-table.c | 42 ++++---------------------------------- net/batman-adv/types.h | 4 ++++ 3 files changed, 13 insertions(+), 49 deletions(-)