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

On branch : next

commit 144c829015fdb7c8847e15d7c4efaf5562562058 Merge: 6c27cef f8fd441 Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Jun 6 23:48:29 2016 +0800

Merge branch 'maint' into next

144c829015fdb7c8847e15d7c4efaf5562562058 Makefile | 10 +++++++--- net/batman-adv/soft-interface.c | 9 +++++++++ 2 files changed, 16 insertions(+), 3 deletions(-)