[commits] [batman-adv] master: Merge branch 'next' (41e304b)

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

On branch : master

commit 41e304b2983b08b11952f64b36280f0bb313edae Merge: fff4c83 5c11589 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Sep 6 16:09:35 2015 +0800

Merge branch 'next'

41e304b2983b08b11952f64b36280f0bb313edae net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 4 ++-- net/batman-adv/network-coding.c | 2 +- net/batman-adv/translation-table.c | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-)