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

On branch : master

commit 407e265dec958a9c4d4bfac7aa6fdc27bb28c98d Merge: 839de35 0ebccb4 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat Jan 16 13:39:42 2016 +0800

Merge branch 'next'

407e265dec958a9c4d4bfac7aa6fdc27bb28c98d net/batman-adv/bridge_loop_avoidance.c | 15 +-- net/batman-adv/hard-interface.c | 13 ++- net/batman-adv/hard-interface.h | 18 +-- net/batman-adv/network-coding.c | 19 ++-- net/batman-adv/originator.c | 196 ++++++++++++--------------------- net/batman-adv/originator.h | 1 - net/batman-adv/translation-table.c | 28 +++-- 7 files changed, 108 insertions(+), 182 deletions(-)