[commits] [batman-adv] next: Merge branch 'maint' into next (f808f18)

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

On branch : next

commit f808f1877a5abaf990e6c21daf63edadac849676 Merge: 5d36bde f58a0b0 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat May 7 20:32:53 2016 +0800

Merge branch 'maint' into next

f808f1877a5abaf990e6c21daf63edadac849676 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(-)