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

On branch : next

commit cc063e98e6d8de9f17fe2d6a196aea1734cbadf9 Merge: 2fc460e 1798ad3 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Jul 7 16:48:35 2015 +0800

Merge branch 'maint' into next

cc063e98e6d8de9f17fe2d6a196aea1734cbadf9 net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 11 ++++++----- net/batman-adv/network-coding.c | 2 +- net/batman-adv/translation-table.c | 3 ++- net/batman-adv/types.h | 8 ++++---- 5 files changed, 14 insertions(+), 12 deletions(-)