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

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

On branch : next

commit 73788308241177c50febee223bef48844c069ab1 Merge: 1718050 20df5c5 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Jul 5 17:34:12 2016 +0800

Merge branch 'maint' into next

73788308241177c50febee223bef48844c069ab1 net/batman-adv/bridge_loop_avoidance.c | 116 ++++++++++++++++++++++++++------- net/batman-adv/distributed-arp-table.c | 10 ++- net/batman-adv/originator.c | 15 +++++ net/batman-adv/routing.c | 52 +++++++++++---- net/batman-adv/translation-table.c | 8 ++- net/batman-adv/types.h | 6 +- 6 files changed, 164 insertions(+), 43 deletions(-)