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

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

On branch : next

commit 2535f8c4329f833054d3856156e9460efb66988b Merge: 768323e 7f220ed Author: Marek Lindner mareklindner@neomailbox.ch Date: Wed Jun 17 18:49:53 2015 +0800

Merge branch 'maint' into next

2535f8c4329f833054d3856156e9460efb66988b net/batman-adv/distributed-arp-table.c | 4 +- net/batman-adv/multicast.c | 68 ++++++++++++++++++++++++-------- net/batman-adv/network-coding.c | 4 +- net/batman-adv/originator.c | 4 ++ net/batman-adv/translation-table.c | 4 +- net/batman-adv/types.h | 7 +++- 6 files changed, 67 insertions(+), 24 deletions(-)