[commits] [batman-adv] master: Merge branch 'next' (141c6e9)

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

On branch : master

commit 141c6e91c6594c310c53117d45bbafe02fabb958 Merge: 6c0b7de f8a8f60 Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Apr 20 11:49:42 2015 +0800

Merge branch 'next'

141c6e91c6594c310c53117d45bbafe02fabb958 compat.h | 6 ++++++ gateway_common.c | 8 ++++---- hard-interface.c | 5 +++-- sysfs.c | 24 ++++++++---------------- 4 files changed, 21 insertions(+), 22 deletions(-)