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

On branch : master

commit 64382bc56ee9452ad01701eed1b5a4525b6c4d7b Merge: 817b244 8ce897a Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat Aug 8 03:07:19 2015 +0800

Merge branch 'next'

64382bc56ee9452ad01701eed1b5a4525b6c4d7b net/batman-adv/hard-interface.c | 41 +++++++++++++++++++++++++++++++++++++++++ net/batman-adv/soft-interface.c | 2 -- 2 files changed, 41 insertions(+), 2 deletions(-)