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

On branch : master

commit 0de2e90ae3f5d0d223a0eb94d86a5e7fcf10a427 Merge: 033b779 7378830 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Jul 5 17:35:09 2016 +0800

Merge branch 'next'

0de2e90ae3f5d0d223a0eb94d86a5e7fcf10a427 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(-)