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

On branch : master

commit b9b834585eb8e4c0a6bfe2903e88a1962627dddb Merge: 917539e 01e5b85 Author: Sven Eckelmann sven@narfation.org Date: Tue Oct 18 13:03:33 2016 +0200

Merge branch 'next'

b9b834585eb8e4c0a6bfe2903e88a1962627dddb .gitignore | 10 ++++------ Makefile | 32 ++++++++++++++++++++++++++++---- compat-include/net/genetlink.h | 6 ++++++ compat-patches/README | 23 +++++++++++++++++++++++ compat-patches/replacements.sh | 8 ++++++++ compat-sources/Makefile | 6 +++--- net/batman-adv/debugfs.h | 2 -- net/batman-adv/log.h | 2 +- net/batman-adv/netlink.c | 4 ++-- net/batman-adv/originator.c | 2 +- 10 files changed, 76 insertions(+), 19 deletions(-)