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

On branch : master

commit 4e90f564b1049a091604ba64f2943ebde8f2c59b Merge: 586d838 f808f18 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat May 7 20:36:38 2016 +0800

Merge branch 'next'

4e90f564b1049a091604ba64f2943ebde8f2c59b net/batman-adv/bat_v.c | 10 ++++++++++ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++--------- net/batman-adv/bat_v_elp.h | 2 ++ 3 files changed, 34 insertions(+), 9 deletions(-)