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

On branch : next

commit 768323e2eacb5c9bf3b45557a648619ce3c71fc7 Merge: 34124bb 9bbd794 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Jun 9 22:52:04 2015 +0800

Merge branch 'maint' into next

768323e2eacb5c9bf3b45557a648619ce3c71fc7 net/batman-adv/distributed-arp-table.c | 18 +++++++++++++----- net/batman-adv/gateway_client.c | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-)