[commits] [batman-adv] next: Merge branch 'maint' into next (7870bad)

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

On branch : next

commit 7870bad343c1d511fe596d4565ef3134c2470fa8 Merge: 2535f8c af912d7 Author: Marek Lindner mareklindner@neomailbox.ch Date: Fri Jun 19 17:16:21 2015 +0800

Merge branch 'maint' into next

Conflicts: net/batman-adv/translation-table.c

7870bad343c1d511fe596d4565ef3134c2470fa8 net/batman-adv/originator.c | 9 +++++---- net/batman-adv/soft-interface.c | 3 +++ net/batman-adv/translation-table.c | 29 ++++++++++++++++++++++++----- 3 files changed, 32 insertions(+), 9 deletions(-)