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

On branch : next

commit 5c115891259452212a72b6b7380df767a5dfda38 Merge: 071aadb d126204 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Sep 6 16:08:52 2015 +0800

Merge branch 'maint' into next

5c115891259452212a72b6b7380df767a5dfda38 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(-)