[commits] [batman-adv] master: Merge branch 'next' (033b779)

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

On branch : master

commit 033b7794f871d35ee3feab32b093aeed4393c582 Merge: 633703f 1718050 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Jul 5 16:44:03 2016 +0800

Merge branch 'next'

033b7794f871d35ee3feab32b093aeed4393c582 include/uapi/linux/batman_adv.h | 20 ++++++++++---------- net/batman-adv/Kconfig | 2 +- net/batman-adv/routing.c | 10 ++++------ net/batman-adv/send.c | 17 +++++++++++++---- net/batman-adv/tp_meter.c | 3 +++ net/batman-adv/tvlv.c | 2 +- 6 files changed, 32 insertions(+), 22 deletions(-)